lots of stuff
This commit is contained in:
1 parent
ee9ac93b5e
commit
ea24b19068
5242 files changed
+336231
-112
No files matched your search
@@ -357,6 +357,7 @@ public class AntarchyForge {
|
||||
AntarchyObjects.setKrakenTentacle(() -> AntarchyForgeItems.KRAKEN_TENTACLE.get());
|
||||
AntarchyObjects.setKrakensGrasp(() -> AntarchyForgeItems.KRAKENS_GRASP.get());
|
||||
AntarchyObjects.setOuranwoodDeer(AntarchyForgeEntites.OURANWOOD_DEER);
|
||||
AntarchyObjects.setDimensionalTear(AntarchyForgeEntites.DIMENSIONAL_TEAR);
|
||||
AntarchyObjects.setGlimmer(AntarchyForgeEntites.GLIMMER);
|
||||
AntarchyObjects.setRollyPolly(AntarchyForgeEntites.ROLLY_POLLY);
|
||||
AntarchyObjects.setSpiritApple(() -> AntarchyForgeItems.SPIRIT_APPLE.get());
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.craisinlord.antarchy.forge;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.command.CavarynCommand;
|
||||
import com.craisinlord.antarchy.content.command.CaterpillarCommand;
|
||||
import com.craisinlord.antarchy.content.command.GravityCommand;
|
||||
import net.minecraftforge.event.RegisterCommandsEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = Antarchy.MODID)
|
||||
final class AntarchyForgeCommandEvents {
|
||||
private AntarchyForgeCommandEvents() {
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onRegisterCommands(RegisterCommandsEvent event) {
|
||||
CavarynCommand.register(event.getDispatcher());
|
||||
GravityCommand.register(event.getDispatcher());
|
||||
CaterpillarCommand.register(event.getDispatcher());
|
||||
}
|
||||
}
|
||||
+6
-6
@@ -30,10 +30,10 @@ public final class AntarchyForgeFluidTypes {
|
||||
private static final ResourceLocation WATER_FLOW = ResourceLocation.withDefaultNamespace("block/water_flow");
|
||||
private static final ResourceLocation WATER_OVERLAY = ResourceLocation.withDefaultNamespace("block/water_overlay");
|
||||
private static final ResourceLocation UNDERWATER_OVERLAY = ResourceLocation.withDefaultNamespace("textures/misc/underwater.png");
|
||||
private static final ResourceLocation ANTIWATER_STILL = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/antiwater_still");
|
||||
private static final ResourceLocation ANTIWATER_FLOW = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/antiwater_flow");
|
||||
private static final ResourceLocation BILE_STILL = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/bile/bile_still");
|
||||
private static final ResourceLocation BILE_FLOW = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/bile/bile_flowing");
|
||||
private static final ResourceLocation ANTIWATER_STILL = new ResourceLocation(Antarchy.MODID, "block/antiwater_still");
|
||||
private static final ResourceLocation ANTIWATER_FLOW = new ResourceLocation(Antarchy.MODID, "block/antiwater_flow");
|
||||
private static final ResourceLocation BILE_STILL = new ResourceLocation(Antarchy.MODID, "block/bile/bile_still");
|
||||
private static final ResourceLocation BILE_FLOW = new ResourceLocation(Antarchy.MODID, "block/bile/bile_flowing");
|
||||
|
||||
private static final DeferredRegister<FluidType> FLUID_TYPES =
|
||||
DeferredRegister.create(ForgeRegistries.Keys.FLUID_TYPES, Antarchy.MODID);
|
||||
@@ -225,12 +225,12 @@ public final class AntarchyForgeFluidTypes {
|
||||
consumer.accept(new IClientFluidTypeExtensions() {
|
||||
@Override
|
||||
public ResourceLocation getStillTexture() {
|
||||
return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/lumen_still");
|
||||
return new ResourceLocation(Antarchy.MODID, "block/lumen_still");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getFlowingTexture() {
|
||||
return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/lumen_flow");
|
||||
return new ResourceLocation(Antarchy.MODID, "block/lumen_flow");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,6 +7,7 @@ import net.minecraft.world.level.block.state.properties.WoodType;
|
||||
public final class AntarchyWoodTypes {
|
||||
public static final WoodType OURANWOOD = register("ouranwood");
|
||||
public static final WoodType PEACH = register("peach");
|
||||
public static final WoodType NADIR = register("nadir");
|
||||
|
||||
private AntarchyWoodTypes() {
|
||||
}
|
||||
|
||||
+20
-10
@@ -67,19 +67,21 @@ import com.craisinlord.antarchy.content.client.AntarchyGeoItemRenderer;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = Antarchy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
|
||||
public final class AntarchyForgeClient {
|
||||
private static final ResourceLocation DR_TRAYAURUS_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/dr_trayaurus.png");
|
||||
private static final ResourceLocation OURANWOOD_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/boat/ouranwood.png");
|
||||
private static final ResourceLocation OURANWOOD_CHEST_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/chest_boat/ouranwood.png");
|
||||
private static final ResourceLocation PEACH_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/boat/peach.png");
|
||||
private static final ResourceLocation PEACH_CHEST_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/chest_boat/peach.png");
|
||||
private static final ResourceLocation DR_TRAYAURUS_TEXTURE = new ResourceLocation(Antarchy.MODID, "textures/entity/dr_trayaurus.png");
|
||||
private static final ResourceLocation OURANWOOD_BOAT_TEXTURE = new ResourceLocation(Antarchy.MODID, "textures/entity/boat/ouranwood.png");
|
||||
private static final ResourceLocation OURANWOOD_CHEST_BOAT_TEXTURE = new ResourceLocation(Antarchy.MODID, "textures/entity/chest_boat/ouranwood.png");
|
||||
private static final ResourceLocation PEACH_BOAT_TEXTURE = new ResourceLocation(Antarchy.MODID, "textures/entity/boat/peach.png");
|
||||
private static final ResourceLocation PEACH_CHEST_BOAT_TEXTURE = new ResourceLocation(Antarchy.MODID, "textures/entity/chest_boat/peach.png");
|
||||
private static final ResourceLocation NADIR_BOAT_TEXTURE = new ResourceLocation(Antarchy.MODID, "textures/entity/boat/nadir.png");
|
||||
private static final ResourceLocation NADIR_CHEST_BOAT_TEXTURE = new ResourceLocation(Antarchy.MODID, "textures/entity/chest_boat/nadir.png");
|
||||
private static final ResourceLocation WATER_STILL = ResourceLocation.withDefaultNamespace("block/water_still");
|
||||
private static final ResourceLocation WATER_FLOW = ResourceLocation.withDefaultNamespace("block/water_flow");
|
||||
private static final ResourceLocation WATER_OVERLAY = ResourceLocation.withDefaultNamespace("block/water_overlay");
|
||||
private static final ResourceLocation UNDERWATER_OVERLAY = ResourceLocation.withDefaultNamespace("textures/misc/underwater.png");
|
||||
private static final ResourceLocation ANTIWATER_STILL = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/antiwater_still");
|
||||
private static final ResourceLocation ANTIWATER_FLOW = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/antiwater_flow");
|
||||
private static final ResourceLocation BILE_STILL = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/bile/bile_still");
|
||||
private static final ResourceLocation BILE_FLOW = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/bile/bile_flowing");
|
||||
private static final ResourceLocation ANTIWATER_STILL = new ResourceLocation(Antarchy.MODID, "block/antiwater_still");
|
||||
private static final ResourceLocation ANTIWATER_FLOW = new ResourceLocation(Antarchy.MODID, "block/antiwater_flow");
|
||||
private static final ResourceLocation BILE_STILL = new ResourceLocation(Antarchy.MODID, "block/bile/bile_still");
|
||||
private static final ResourceLocation BILE_FLOW = new ResourceLocation(Antarchy.MODID, "block/bile/bile_flowing");
|
||||
private AntarchyForgeClient() {
|
||||
}
|
||||
|
||||
@@ -107,6 +109,8 @@ public final class AntarchyForgeClient {
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.OURANWOOD_CHEST_BOAT_ENTITY.get(), context -> new OuranwoodBoatRenderer<>(context, OURANWOOD_CHEST_BOAT_TEXTURE, true));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.PEACH_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, PEACH_BOAT_TEXTURE, false));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.PEACH_CHEST_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, PEACH_CHEST_BOAT_TEXTURE, true));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.NADIR_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, NADIR_BOAT_TEXTURE, false));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.NADIR_CHEST_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, NADIR_CHEST_BOAT_TEXTURE, true));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.APPLE_COW.get(), context -> withParalyzedGeoLayer(new AppleCowRenderer(context)));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.GOLDEN_APPLE_COW.get(), context -> withParalyzedGeoLayer(new AppleCowRenderer(context)));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.ENCHANTED_GOLDEN_APPLE_COW.get(), context -> withParalyzedGeoLayer(new AppleCowRenderer(context)));
|
||||
@@ -121,6 +125,7 @@ public final class AntarchyForgeClient {
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.NIGHTMARE.get(), context -> withParalyzedGeoLayer(new NightmareRenderer(context)));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.NIGHTMARE_PORTAL.get(), NightmarePortalRenderer::new);
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.NIGHTMARE_BITE.get(), NightmareBiteRenderer::new);
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.DIMENSIONAL_TEAR.get(), DimensionalTearRenderer::new);
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.LUCID.get(), context -> withParalyzedGeoLayer(new LucidRenderer(context)));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.BED_BUG.get(), context -> withParalyzedGeoLayer(new BedBugRenderer(context)));
|
||||
event.registerEntityRenderer(AntarchyForgeEntites.WASP.get(), context -> withParalyzedGeoLayer(new WaspRenderer(context)));
|
||||
@@ -359,6 +364,11 @@ public final class AntarchyForgeClient {
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.PEACH_TRAPDOOR.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.PEACH_SAPLING.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.POTTED_PEACH_SAPLING.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.NADIR_VEIL.get(), RenderType.translucent());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.NADIR_DOOR.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.NADIR_TRAPDOOR.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.NADIR_SAPLING.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.POTTED_NADIR_SAPLING.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.DUPLICATOR_SAPLING.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.ORANGE_MILKWEED.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyForgeBlocks.PINK_MILKWEED.get(), RenderType.cutout());
|
||||
@@ -484,7 +494,7 @@ public final class AntarchyForgeClient {
|
||||
);
|
||||
ItemProperties.register(
|
||||
AntarchyForgeItems.CRITTER_CAGE.get(),
|
||||
ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "critter_cage_state"),
|
||||
new ResourceLocation(Antarchy.MODID, "critter_cage_state"),
|
||||
(stack, level, entity, seed) -> {
|
||||
if (!(stack.getItem() instanceof com.craisinlord.antarchy.content.item.CritterCageItem cage)) {
|
||||
return 0.0F;
|
||||
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.craisinlord.antarchy.forge.client;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.client.SizeRaySoundHandler;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.event.TickEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = Antarchy.MODID, value = Dist.CLIENT)
|
||||
public final class SizeRaySoundHandlerForge {
|
||||
private SizeRaySoundHandlerForge() {
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onClientTick(TickEvent.ClientTickEvent event) {
|
||||
if (event.phase != TickEvent.Phase.END) {
|
||||
return;
|
||||
}
|
||||
SizeRaySoundHandler.tick(Minecraft.getInstance());
|
||||
}
|
||||
}
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package com.craisinlord.antarchy.forge.client;
|
||||
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.client.TigerEyeCamouflageClientState;
|
||||
import com.craisinlord.antarchy.content.client.renderer.TigerEyeCamouflageTextureResolver;
|
||||
import com.craisinlord.antarchy.content.network.ToggleTigerEyeCamouflagePayload;
|
||||
import com.craisinlord.antarchy.forge.network.AntarchyForgeNetworkCore;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.event.TickEvent;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = Antarchy.MODID, value = Dist.CLIENT)
|
||||
public final class TigerEyeCamouflageClientHandler {
|
||||
private TigerEyeCamouflageClientHandler() {
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onClientTick(TickEvent.ClientTickEvent event) {
|
||||
if (event.phase != TickEvent.Phase.END) return;
|
||||
|
||||
Minecraft minecraft = Minecraft.getInstance();
|
||||
if (minecraft.player == null || minecraft.level == null) {
|
||||
TigerEyeCamouflageClientState.clear();
|
||||
return;
|
||||
}
|
||||
|
||||
while (AntarchyKeyBindings.consumeTigerEyeCamouflagePressed()) {
|
||||
AntarchyForgeNetworkCore.sendToServer(new ToggleTigerEyeCamouflagePayload());
|
||||
}
|
||||
}
|
||||
|
||||
public static void clearClientCaches() {
|
||||
TigerEyeCamouflageClientState.clear();
|
||||
TigerEyeCamouflageTextureResolver.clearCache();
|
||||
}
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package com.craisinlord.antarchy.forge.mixins.compat;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.material.FluidState;
|
||||
import net.minecraft.world.level.material.Fluids;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Pseudo;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Pseudo
|
||||
@Mixin(targets = "dev.ryanhcode.sable.physics.impl.rapier.collider.PhysicsColliderBlockGetter", remap = false)
|
||||
public class SablePhysicsColliderBlockGetterMixin {
|
||||
@Shadow
|
||||
private BlockState state;
|
||||
|
||||
@Inject(method = "getFluidState", at = @At("HEAD"), cancellable = true, remap = false)
|
||||
private void antarchy$nullSafeFluidState(BlockPos pos, CallbackInfoReturnable<FluidState> cir) {
|
||||
if (this.state == null) {
|
||||
cir.setReturnValue(Fluids.EMPTY.defaultFluidState());
|
||||
}
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.craisinlord.antarchy.forge.mixins.infinity;
|
||||
|
||||
import net.lerariemann.infinity.util.config.Amendment;
|
||||
import net.lerariemann.infinity.util.core.ConfigType;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Mixin(value = Amendment.class, remap = false)
|
||||
/*
|
||||
* Makes Antarchy's uranium/titanium ores and blocks much rarer in Infinite Dimensions'
|
||||
* procedural dimensions. This is done natively via Infinity's own amendment system rather
|
||||
* than relying on players editing infinity's config, keyed off the antarchy:infinity_dimension_rare_ores
|
||||
* block tag so the list stays data-driven and native to Antarchy.
|
||||
*/
|
||||
public class AmendmentRareOresMixin {
|
||||
@Inject(method = "getAmendmentList", at = @At("RETURN"), remap = false)
|
||||
private static void antarchy$addRareOreAmendment(CallbackInfoReturnable<Map<ConfigType, List<Amendment>>> cir) {
|
||||
Map<ConfigType, List<Amendment>> data = cir.getReturnValue();
|
||||
List<Amendment> list = data.computeIfAbsent(ConfigType.BLOCKS, k -> new ArrayList<>());
|
||||
list.add(new Amendment(
|
||||
ConfigType.BLOCKS,
|
||||
new Amendment.UniversalModSelector(),
|
||||
new Amendment.MatchingBlockTagSelector("antarchy:infinity_dimension_rare_ores"),
|
||||
new Amendment.SetValue(0.02)
|
||||
));
|
||||
}
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package com.craisinlord.antarchy.forge.mixins.infinity;
|
||||
|
||||
import com.craisinlord.antarchy.config.AntarchySettings;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import net.lerariemann.infinity.util.teleport.PortalCreator;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
|
||||
@Mixin(value = PortalCreator.class, remap = false)
|
||||
/*
|
||||
* Blocks Infinity portal creation when the config says no
|
||||
*/
|
||||
public class PortalCreatorMixin {
|
||||
@Inject(
|
||||
method = "tryCreatePortalFromItem(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/item/ItemEntity;)V",
|
||||
at = @At("HEAD"),
|
||||
cancellable = true,
|
||||
remap = false
|
||||
)
|
||||
private static void antarchy$blockInfinityBookActivation(ServerLevel level, BlockPos pos, ItemEntity itemEntity, CallbackInfo ci) {
|
||||
if (!AntarchySettings.disableInfinityBookPortalCreation()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (itemEntity.isRemoved()) {
|
||||
return;
|
||||
}
|
||||
|
||||
ItemStack stack = itemEntity.getItem();
|
||||
if (!stack.is(Items.WRITABLE_BOOK) && !stack.is(Items.WRITTEN_BOOK)) {
|
||||
return;
|
||||
}
|
||||
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
@Mixin(BucketItem.class)
|
||||
public abstract class BucketItemThoraxisWaterMixin {
|
||||
private static final ResourceLocation THORAXIS_DIMENSION_ID =
|
||||
ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "thoraxis");
|
||||
new ResourceLocation(Antarchy.MODID, "thoraxis");
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package com.craisinlord.antarchy.forge.network;
|
||||
|
||||
import com.craisinlord.antarchy.content.item.TigerEyeArmorUtil;
|
||||
import com.craisinlord.antarchy.content.network.TigerEyeCamouflageStatePayload;
|
||||
import com.craisinlord.antarchy.content.network.ToggleTigerEyeCamouflagePayload;
|
||||
import com.craisinlord.antarchy.content.tigereye.TigerEyeCamouflageController;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
|
||||
public final class TigerEyeNetworking {
|
||||
private TigerEyeNetworking() {
|
||||
}
|
||||
|
||||
public static void register() {
|
||||
AntarchyForgeNetworkCore.registerS2C(TigerEyeCamouflageStatePayload.class, TigerEyeCamouflageStatePayload.STREAM_CODEC, payload ->
|
||||
com.craisinlord.antarchy.content.client.TigerEyeCamouflageClientState.update(payload.entityId(), payload.active(), payload.blockStateId()));
|
||||
AntarchyForgeNetworkCore.registerC2S(ToggleTigerEyeCamouflagePayload.class, ToggleTigerEyeCamouflagePayload.STREAM_CODEC, (player, payload) -> handleToggle(player));
|
||||
}
|
||||
|
||||
private static void handleToggle(ServerPlayer player) {
|
||||
TigerEyeCamouflageController.ToggleResult result = TigerEyeCamouflageController.toggle(player);
|
||||
if (result != TigerEyeCamouflageController.ToggleResult.NO_CHANGE) {
|
||||
AntarchyForgeNetworkCore.sendToTrackingEntity(player,
|
||||
com.craisinlord.antarchy.content.tigereye.TigerEyeCamouflageSync.payload(player));
|
||||
}
|
||||
String messageKey = switch (result) {
|
||||
case ACTIVATED -> "message.antarchy.tiger_eye_camouflage.activated";
|
||||
case DEACTIVATED -> "message.antarchy.tiger_eye_camouflage.disabled";
|
||||
case FULL_SET_REQUIRED -> TigerEyeArmorUtil.countEquippedPieces(player) > 0
|
||||
? "message.antarchy.tiger_eye_camouflage.full_set_required"
|
||||
: null;
|
||||
case INVALID_BLOCK -> "message.antarchy.tiger_eye_camouflage.invalid_block";
|
||||
case NO_CHANGE -> null;
|
||||
};
|
||||
if (messageKey != null) {
|
||||
player.displayClientMessage(Component.translatable(messageKey), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
+40
@@ -150,6 +150,46 @@ public final class AntarchyForgeBlocks {
|
||||
() -> new CeilingHangingSignBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_HANGING_SIGN), AntarchyWoodTypes.PEACH));
|
||||
public static final RegistryObject<WallHangingSignBlock> PEACH_WALL_HANGING_SIGN = BLOCKS.register("peach_wall_hanging_sign",
|
||||
() -> new WallHangingSignBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_WALL_HANGING_SIGN), AntarchyWoodTypes.PEACH));
|
||||
public static final RegistryObject<RotatedPillarBlock> NADIR_LOG = BLOCKS.register("nadir_log",
|
||||
() -> new RotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_LOG)));
|
||||
public static final RegistryObject<RotatedPillarBlock> NADIR_WOOD = BLOCKS.register("nadir_wood",
|
||||
() -> new RotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_WOOD)));
|
||||
public static final RegistryObject<RotatedPillarBlock> STRIPPED_NADIR_LOG = BLOCKS.register("stripped_nadir_log",
|
||||
() -> new RotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.STRIPPED_JUNGLE_LOG)));
|
||||
public static final RegistryObject<RotatedPillarBlock> STRIPPED_NADIR_WOOD = BLOCKS.register("stripped_nadir_wood",
|
||||
() -> new RotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.STRIPPED_JUNGLE_WOOD)));
|
||||
public static final RegistryObject<Block> NADIR_PLANKS = BLOCKS.register("nadir_planks",
|
||||
() -> new Block(BlockBehaviour.Properties.copy(Blocks.JUNGLE_PLANKS)));
|
||||
public static final RegistryObject<StairBlock> NADIR_STAIRS = BLOCKS.register("nadir_stairs",
|
||||
() -> new StairBlock(NADIR_PLANKS.get().defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.JUNGLE_STAIRS)));
|
||||
public static final RegistryObject<SlabBlock> NADIR_SLAB = BLOCKS.register("nadir_slab",
|
||||
() -> new SlabBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_SLAB)));
|
||||
public static final RegistryObject<FenceBlock> NADIR_FENCE = BLOCKS.register("nadir_fence",
|
||||
() -> new FenceBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_FENCE)));
|
||||
public static final RegistryObject<FenceGateBlock> NADIR_FENCE_GATE = BLOCKS.register("nadir_fence_gate",
|
||||
() -> new FenceGateBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_FENCE_GATE), WoodType.JUNGLE));
|
||||
public static final RegistryObject<DoorBlock> NADIR_DOOR = BLOCKS.register("nadir_door",
|
||||
() -> new DoorBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_DOOR), BlockSetType.JUNGLE));
|
||||
public static final RegistryObject<TrapDoorBlock> NADIR_TRAPDOOR = BLOCKS.register("nadir_trapdoor",
|
||||
() -> new TrapDoorBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_TRAPDOOR), BlockSetType.JUNGLE));
|
||||
public static final RegistryObject<PressurePlateBlock> NADIR_PRESSURE_PLATE = BLOCKS.register("nadir_pressure_plate",
|
||||
() -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.copy(Blocks.JUNGLE_PRESSURE_PLATE), BlockSetType.JUNGLE));
|
||||
public static final RegistryObject<ButtonBlock> NADIR_BUTTON = BLOCKS.register("nadir_button",
|
||||
() -> new ButtonBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_BUTTON), BlockSetType.JUNGLE, 30, false));
|
||||
public static final RegistryObject<Block> NADIR_VEIL = BLOCKS.register("nadir_veil",
|
||||
() -> new Block(BlockBehaviour.Properties.copy(Blocks.MANGROVE_LEAVES).noCollission().noOcclusion()));
|
||||
public static final RegistryObject<com.craisinlord.antarchy.content.block.NadirSaplingBlock> NADIR_SAPLING = BLOCKS.register("nadir_sapling",
|
||||
() -> new com.craisinlord.antarchy.content.block.NadirSaplingBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SAPLING).randomTicks().noCollission()));
|
||||
public static final RegistryObject<FlowerPotBlock> POTTED_NADIR_SAPLING = BLOCKS.register("potted_nadir_sapling",
|
||||
() -> new FlowerPotBlock(NADIR_SAPLING.get(), BlockBehaviour.Properties.copy(Blocks.POTTED_DANDELION)));
|
||||
public static final RegistryObject<StandingSignBlock> NADIR_SIGN = BLOCKS.register("nadir_sign",
|
||||
() -> new StandingSignBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_SIGN), AntarchyWoodTypes.NADIR));
|
||||
public static final RegistryObject<WallSignBlock> NADIR_WALL_SIGN = BLOCKS.register("nadir_wall_sign",
|
||||
() -> new WallSignBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_WALL_SIGN), AntarchyWoodTypes.NADIR));
|
||||
public static final RegistryObject<CeilingHangingSignBlock> NADIR_HANGING_SIGN = BLOCKS.register("nadir_hanging_sign",
|
||||
() -> new CeilingHangingSignBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_HANGING_SIGN), AntarchyWoodTypes.NADIR));
|
||||
public static final RegistryObject<WallHangingSignBlock> NADIR_WALL_HANGING_SIGN = BLOCKS.register("nadir_wall_hanging_sign",
|
||||
() -> new WallHangingSignBlock(BlockBehaviour.Properties.copy(Blocks.JUNGLE_WALL_HANGING_SIGN), AntarchyWoodTypes.NADIR));
|
||||
public static final RegistryObject<DuplicatorSaplingBlock> DUPLICATOR_SAPLING = BLOCKS.register("duplicator_sapling",
|
||||
() -> new DuplicatorSaplingBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SAPLING).randomTicks().noCollission()));
|
||||
public static final RegistryObject<DuctTapeBlock> DUCT_TAPE = BLOCKS.register("duct_tape",
|
||||
|
||||
+21
@@ -30,6 +30,8 @@ import com.craisinlord.antarchy.content.entity.MolevoreEntity;
|
||||
import com.craisinlord.antarchy.content.entity.MolewormEntity;
|
||||
import com.craisinlord.antarchy.content.entity.OuranwoodBoatEntity;
|
||||
import com.craisinlord.antarchy.content.entity.OuranwoodChestBoatEntity;
|
||||
import com.craisinlord.antarchy.content.entity.NadirBoatEntity;
|
||||
import com.craisinlord.antarchy.content.entity.NadirChestBoatEntity;
|
||||
import com.craisinlord.antarchy.content.entity.PeachBoatEntity;
|
||||
import com.craisinlord.antarchy.content.entity.PeachChestBoatEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ReverieEntity;
|
||||
@@ -59,6 +61,7 @@ import com.craisinlord.antarchy.content.entity.lucid.LucidEyeProjectileEntity;
|
||||
import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity;
|
||||
import com.craisinlord.antarchy.content.entity.nightmare.NightmareBiteEntity;
|
||||
import com.craisinlord.antarchy.content.entity.nightmare.NightmarePortalEntity;
|
||||
import com.craisinlord.antarchy.content.entity.portal.DimensionalTearEntity;
|
||||
import com.craisinlord.antarchy.content.entity.CheepEntity;
|
||||
import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity;
|
||||
import com.craisinlord.antarchy.content.entity.DorrieEntity;
|
||||
@@ -138,6 +141,18 @@ public final class AntarchyForgeEntites {
|
||||
.clientTrackingRange(10)
|
||||
.updateInterval(10)
|
||||
.build("peach_chest_boat"));
|
||||
public static final RegistryObject<EntityType<NadirBoatEntity>> NADIR_BOAT_ENTITY = ENTITY_TYPES.register("nadir_boat",
|
||||
() -> EntityType.Builder.<NadirBoatEntity>of(NadirBoatEntity::new, MobCategory.MISC)
|
||||
.sized(1.375F, 0.5625F)
|
||||
.clientTrackingRange(10)
|
||||
.updateInterval(10)
|
||||
.build("nadir_boat"));
|
||||
public static final RegistryObject<EntityType<NadirChestBoatEntity>> NADIR_CHEST_BOAT_ENTITY = ENTITY_TYPES.register("nadir_chest_boat",
|
||||
() -> EntityType.Builder.<NadirChestBoatEntity>of(NadirChestBoatEntity::new, MobCategory.MISC)
|
||||
.sized(1.375F, 0.5625F)
|
||||
.clientTrackingRange(10)
|
||||
.updateInterval(10)
|
||||
.build("nadir_chest_boat"));
|
||||
public static final RegistryObject<EntityType<MolevoreEntity>> MOLEVORE = ENTITY_TYPES.register("molevore",
|
||||
() -> EntityType.Builder.of(MolevoreEntity::new, MobCategory.MONSTER)
|
||||
.sized(1.95F, 1.1F)
|
||||
@@ -407,6 +422,12 @@ public final class AntarchyForgeEntites {
|
||||
.clientTrackingRange(10)
|
||||
.updateInterval(1)
|
||||
.build("upward_falling_block"));
|
||||
public static final RegistryObject<EntityType<DimensionalTearEntity>> DIMENSIONAL_TEAR = ENTITY_TYPES.register("dimensional_tear",
|
||||
() -> EntityType.Builder.<DimensionalTearEntity>of(DimensionalTearEntity::new, MobCategory.MISC)
|
||||
.sized(1.0F, 2.75F)
|
||||
.clientTrackingRange(12)
|
||||
.updateInterval(2)
|
||||
.build("dimensional_tear"));
|
||||
|
||||
private AntarchyForgeEntites() {}
|
||||
|
||||
|
||||
+2
-1
@@ -1131,7 +1131,7 @@ public final class AntarchyForgeEvents {
|
||||
static void registerBrewingRecipes() {
|
||||
net.minecraft.tags.TagKey<net.minecraft.world.item.Item> rootsTag = net.minecraft.tags.TagKey.create(
|
||||
net.minecraft.core.registries.Registries.ITEM,
|
||||
net.minecraft.resources.ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "roots")
|
||||
new net.minecraft.resources.ResourceLocation(Antarchy.MODID, "roots")
|
||||
);
|
||||
net.minecraftforge.common.brewing.BrewingRecipeRegistry.addRecipe(new BrewingRecipe(
|
||||
net.minecraft.world.item.crafting.Ingredient.of(Items.POTION),
|
||||
@@ -1338,6 +1338,7 @@ public final class AntarchyForgeEvents {
|
||||
ComposterBlock.COMPOSTABLES.put(AntarchyForgeItems.CORNEA_EAR.get(), 0.65f);
|
||||
ComposterBlock.COMPOSTABLES.put(AntarchyForgeBlocks.PEACH_LEAVES.get().asItem(), 0.3f);
|
||||
ComposterBlock.COMPOSTABLES.put(AntarchyForgeItems.PEACH_SAPLING_ITEM.get(), 0.3f);
|
||||
ComposterBlock.COMPOSTABLES.put(AntarchyForgeItems.NADIR_SAPLING_ITEM.get(), 0.3f);
|
||||
ComposterBlock.COMPOSTABLES.put(AntarchyForgeItems.CORN.get(), 0.65f);
|
||||
ComposterBlock.COMPOSTABLES.put(AntarchyForgeItems.CORN_SEEDS.get(), 0.3f);
|
||||
ComposterBlock.COMPOSTABLES.put(AntarchyForgeItems.PEACH.get(), 0.65f);
|
||||
|
||||
+30
-7
@@ -199,6 +199,21 @@ public final class AntarchyForgeItems {
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> PEACH_BUTTON_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.PEACH_BUTTON);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> PEACH_LEAVES_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.PEACH_LEAVES);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> PEACH_SAPLING_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.PEACH_SAPLING);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_LOG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_LOG);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_WOOD_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_WOOD);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> STRIPPED_NADIR_LOG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.STRIPPED_NADIR_LOG);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> STRIPPED_NADIR_WOOD_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.STRIPPED_NADIR_WOOD);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_PLANKS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_PLANKS);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_STAIRS);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_SLAB);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_FENCE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_FENCE);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_FENCE_GATE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_FENCE_GATE);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_DOOR_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_DOOR);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_TRAPDOOR_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_TRAPDOOR);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_PRESSURE_PLATE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_PRESSURE_PLATE);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_BUTTON_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_BUTTON);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_VEIL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_VEIL);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> NADIR_SAPLING_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.NADIR_SAPLING);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> ORANGE_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.ORANGE_MILKWEED);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> PINK_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.PINK_MILKWEED);
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> CAMELLIA_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.CAMELLIA);
|
||||
@@ -225,6 +240,14 @@ public final class AntarchyForgeItems {
|
||||
() -> new PeachBoatOnlyItem(AntarchyForgeEntites.PEACH_BOAT_ENTITY, new Item.Properties().stacksTo(1)));
|
||||
public static final RegistryObject<Item> PEACH_CHEST_BOAT = ITEMS.register("peach_chest_boat",
|
||||
() -> new PeachChestBoatItem(AntarchyForgeEntites.PEACH_CHEST_BOAT_ENTITY, new Item.Properties().stacksTo(1)));
|
||||
public static final RegistryObject<net.minecraft.world.item.SignItem> NADIR_SIGN_ITEM = ITEMS.register("nadir_sign",
|
||||
() -> new net.minecraft.world.item.SignItem(new Item.Properties().stacksTo(16), AntarchyForgeBlocks.NADIR_SIGN.get(), AntarchyForgeBlocks.NADIR_WALL_SIGN.get()));
|
||||
public static final RegistryObject<net.minecraft.world.item.HangingSignItem> NADIR_HANGING_SIGN_ITEM = ITEMS.register("nadir_hanging_sign",
|
||||
() -> new net.minecraft.world.item.HangingSignItem(AntarchyForgeBlocks.NADIR_HANGING_SIGN.get(), AntarchyForgeBlocks.NADIR_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16)));
|
||||
public static final RegistryObject<Item> NADIR_BOAT = ITEMS.register("nadir_boat",
|
||||
() -> new NadirBoatOnlyItem(AntarchyForgeEntites.NADIR_BOAT_ENTITY, new Item.Properties().stacksTo(1)));
|
||||
public static final RegistryObject<Item> NADIR_CHEST_BOAT = ITEMS.register("nadir_chest_boat",
|
||||
() -> new NadirChestBoatItem(AntarchyForgeEntites.NADIR_CHEST_BOAT_ENTITY, new Item.Properties().stacksTo(1)));
|
||||
public static final RegistryObject<CritterCageItem> CRITTER_CAGE = ITEMS.register("critter_cage",
|
||||
() -> new CritterCageItem(new Item.Properties().stacksTo(16)));
|
||||
public static final RegistryObject<net.minecraft.world.item.BlockItem> DUPLICATOR_SAPLING_ITEM = ITEMS.registerSimpleBlockItem(AntarchyForgeBlocks.DUPLICATOR_SAPLING);
|
||||
@@ -721,9 +744,9 @@ public final class AntarchyForgeItems {
|
||||
new Item.Properties().stacksTo(1).durability(512).rarity(Rarity.RARE).fireResistant(),
|
||||
AntarchyForgeEntites.SHRINK_RAY_PROJECTILE,
|
||||
SizeRayProjectileEntity.SizeRayType.SHRINK,
|
||||
ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/shrink_ray.geo.json"),
|
||||
ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/models/item/shrink_ray.png"),
|
||||
ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/shrink_ray.animation.json"),
|
||||
new ResourceLocation(Antarchy.MODID, "geo/shrink_ray.geo.json"),
|
||||
new ResourceLocation(Antarchy.MODID, "textures/models/item/shrink_ray.png"),
|
||||
new ResourceLocation(Antarchy.MODID, "animations/shrink_ray.animation.json"),
|
||||
"shrink_ray_active"
|
||||
) {
|
||||
@Override
|
||||
@@ -736,9 +759,9 @@ public final class AntarchyForgeItems {
|
||||
new Item.Properties().stacksTo(1).durability(512).rarity(Rarity.RARE).fireResistant(),
|
||||
AntarchyForgeEntites.GROWTH_RAY_PROJECTILE,
|
||||
SizeRayProjectileEntity.SizeRayType.GROWTH,
|
||||
ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/growth_ray.geo.json"),
|
||||
ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/models/item/growth_ray.png"),
|
||||
ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/growth_ray.animation.json"),
|
||||
new ResourceLocation(Antarchy.MODID, "geo/growth_ray.geo.json"),
|
||||
new ResourceLocation(Antarchy.MODID, "textures/models/item/growth_ray.png"),
|
||||
new ResourceLocation(Antarchy.MODID, "animations/growth_ray.animation.json"),
|
||||
"growth_ray_active"
|
||||
) {
|
||||
@Override
|
||||
@@ -978,7 +1001,7 @@ public final class AntarchyForgeItems {
|
||||
}
|
||||
|
||||
static Ingredient bloodCrystalRepairIngredient() {
|
||||
return Ingredient.of(BuiltInRegistries.ITEM.getOptional(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "blood_crystal_shard"))
|
||||
return Ingredient.of(BuiltInRegistries.ITEM.getOptional(new ResourceLocation(Antarchy.MODID, "blood_crystal_shard"))
|
||||
.orElse(Items.AIR));
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -268,6 +268,8 @@ public final class AntarchyForgeMisc {
|
||||
() -> new PeachForestPondFeature(PeachForestPondConfiguration.CODEC));
|
||||
public static final RegistryObject<CoralSpikeFeature> ELYTHIA_CORAL_SPIKE = FEATURES.register("elythia_coral_spike",
|
||||
() -> new CoralSpikeFeature(NoneFeatureConfiguration.CODEC));
|
||||
public static final RegistryObject<DimensionalTearFeature> DIMENSIONAL_TEAR = FEATURES.register("dimensional_tear",
|
||||
() -> new DimensionalTearFeature(NoneFeatureConfiguration.CODEC));
|
||||
public static final RegistryObject<com.craisinlord.antarchy.content.worldgen.elythia.FallenOuranwoodFeature> FALLEN_OURANWOOD_TREE = FEATURES.register("fallen_ouranwood_tree",
|
||||
() -> new com.craisinlord.antarchy.content.worldgen.elythia.FallenOuranwoodFeature(NoneFeatureConfiguration.CODEC));
|
||||
public static final RegistryObject<com.craisinlord.antarchy.content.worldgen.elythia.FungalMushroomFeature> FUNGAL_MUSHROOM = FEATURES.register("fungal_mushroom",
|
||||
|
||||
+1
-1
@@ -187,6 +187,6 @@ public final class AntarchyForgeSounds {
|
||||
|
||||
private static RegistryObject<SoundEvent> registerSoundEvent(String path) {
|
||||
return SOUND_EVENTS.register(path,
|
||||
() -> SoundEvent.createVariableRangeEvent(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, path)));
|
||||
() -> SoundEvent.createVariableRangeEvent(new ResourceLocation(Antarchy.MODID, path)));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"parent": "neoforge:item/bucket",
|
||||
"loader": "neoforge:fluid_container",
|
||||
"fluid": "antarchy:antiwater"
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"textures": {
|
||||
"layer0": "antarchy:item/attitude_adjuster/attitude_adjuster_item"
|
||||
},
|
||||
"base": {
|
||||
"parent": "antarchy:item/attitude_adjuster_held"
|
||||
},
|
||||
"texture_size": [
|
||||
64,
|
||||
64
|
||||
],
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/attitude_adjuster_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/attitude_adjuster_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/attitude_adjuster_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"textures": {
|
||||
"layer0": "antarchy:item/battle_axe/battle_axe_item"
|
||||
},
|
||||
"base": {
|
||||
"parent": "antarchy:item/battle_axe_held"
|
||||
},
|
||||
"texture_size": [
|
||||
64,
|
||||
64
|
||||
],
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/battle_axe_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/battle_axe_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/battle_axe_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"textures": {
|
||||
"layer0": "antarchy:item/big_bertha/big_bertha_item"
|
||||
},
|
||||
"base": {
|
||||
"parent": "antarchy:item/big_bertha_held"
|
||||
},
|
||||
"texture_size": [
|
||||
64,
|
||||
64
|
||||
],
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/big_bertha_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/big_bertha_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/big_bertha_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"parent": "neoforge:item/bucket",
|
||||
"loader": "neoforge:fluid_container",
|
||||
"fluid": "antarchy:bile"
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"base": {
|
||||
"parent": "antarchy:item/gravity_gun_held_geo"
|
||||
},
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/gravity_gun_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/gravity_gun_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/gravity_gun_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"base": {
|
||||
"parent": "antarchy:item/grow_ray_held_geo"
|
||||
},
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/grow_ray_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/grow_ray_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/grow_ray_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"parent": "neoforge:item/bucket",
|
||||
"loader": "neoforge:fluid_container",
|
||||
"fluid": "antarchy:ichor"
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"textures": {
|
||||
"layer0": "antarchy:item/krakens_grasp/krakens_grasp_item"
|
||||
},
|
||||
"base": {
|
||||
"parent": "antarchy:item/krakens_grasp_held"
|
||||
},
|
||||
"texture_size": [
|
||||
64,
|
||||
64
|
||||
],
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/krakens_grasp_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/krakens_grasp_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/krakens_grasp_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"parent": "neoforge:item/bucket",
|
||||
"loader": "neoforge:fluid_container",
|
||||
"fluid": "antarchy:lumen"
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"base": {
|
||||
"parent": "antarchy:item/rpo_launcher_held_geo"
|
||||
},
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/rpo_launcher_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/rpo_launcher_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/rpo_launcher_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"base": {
|
||||
"parent": "antarchy:item/shrink_ray_held_geo"
|
||||
},
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/shrink_ray_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/shrink_ray_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/shrink_ray_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"base": {
|
||||
"parent": "antarchy:item/squidzooka_held_geo"
|
||||
},
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/squidzooka_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/squidzooka_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/squidzooka_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"loader": "neoforge:separate_transforms",
|
||||
"gui_light": "front",
|
||||
"base": {
|
||||
"parent": "antarchy:item/water_cannon_held_geo"
|
||||
},
|
||||
"perspectives": {
|
||||
"gui": {
|
||||
"parent": "antarchy:item/water_cannon_gui"
|
||||
},
|
||||
"ground": {
|
||||
"parent": "antarchy:item/water_cannon_gui"
|
||||
},
|
||||
"fixed": {
|
||||
"parent": "antarchy:item/water_cannon_gui"
|
||||
}
|
||||
}
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:overworld_ant_nest_spawn_biomes",
|
||||
"features": [
|
||||
"antarchy:brown_ant_nest",
|
||||
"antarchy:rainbow_ant_nest",
|
||||
"antarchy:termite_nest"
|
||||
],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:apple_cow_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:apple_cow",
|
||||
"weight": 10,
|
||||
"minCount": 2,
|
||||
"maxCount": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:wild_corn_spawn_biomes",
|
||||
"features": [
|
||||
"antarchy:corn_patch"
|
||||
],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:dorrie_elythia_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:dorrie",
|
||||
"weight": 10,
|
||||
"minCount": 1,
|
||||
"maxCount": 2
|
||||
}
|
||||
]
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:dorrie_overworld_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:dorrie",
|
||||
"weight": 1,
|
||||
"minCount": 1,
|
||||
"maxCount": 1
|
||||
}
|
||||
]
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:flower_forest_butterfly_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:butterfly",
|
||||
"weight": 28,
|
||||
"minCount": 2,
|
||||
"maxCount": 5
|
||||
}
|
||||
]
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:flower_forest_caterpillar_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:caterpillar",
|
||||
"weight": 24,
|
||||
"minCount": 2,
|
||||
"maxCount": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:flying_squirrel_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:flying_squirrel",
|
||||
"weight": 8,
|
||||
"minCount": 1,
|
||||
"maxCount": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:golden_apple_cow_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:golden_apple_cow",
|
||||
"weight": 1,
|
||||
"minCount": 1,
|
||||
"maxCount": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:mantis_overworld_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:mantis",
|
||||
"weight": 8,
|
||||
"minCount": 1,
|
||||
"maxCount": 1
|
||||
},
|
||||
{
|
||||
"type": "antarchy:alpha_mantis",
|
||||
"weight": 1,
|
||||
"minCount": 1,
|
||||
"maxCount": 1
|
||||
}
|
||||
]
|
||||
}
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:milkweed_spawn_biomes",
|
||||
"features": [
|
||||
"antarchy:flower_forest_milkweed"
|
||||
],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": "#antarchy:missile_squid_spawn_biomes",
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:missile_squid",
|
||||
"weight": 2,
|
||||
"minCount": 1,
|
||||
"maxCount": 2
|
||||
}
|
||||
]
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"type": "neoforge:add_spawns",
|
||||
"biomes": [
|
||||
"minecraft:deep_ocean",
|
||||
"minecraft:deep_cold_ocean",
|
||||
"minecraft:deep_lukewarm_ocean",
|
||||
"minecraft:deep_frozen_ocean"
|
||||
],
|
||||
"spawners": [
|
||||
{
|
||||
"type": "antarchy:octopus_bomb",
|
||||
"weight": 2,
|
||||
"minCount": 1,
|
||||
"maxCount": 2
|
||||
}
|
||||
]
|
||||
}
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:is_elythia",
|
||||
"features": [
|
||||
"antarchy:uranium_ore",
|
||||
"antarchy:titanium_ore"
|
||||
],
|
||||
"step": "underground_ores"
|
||||
}
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#minecraft:is_overworld",
|
||||
"features": [
|
||||
"antarchy:uranium_ore",
|
||||
"antarchy:titanium_ore"
|
||||
],
|
||||
"step": "underground_ores"
|
||||
}
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:red_ant_nest_spawn_biomes",
|
||||
"features": [
|
||||
"antarchy:red_ant_nest"
|
||||
],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"type": "neoforge:remove_features",
|
||||
"biomes": "#antarchy:is_cavaryn",
|
||||
"features": [
|
||||
"minecraft:glow_lichen"
|
||||
],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:has_seashell",
|
||||
"features": ["antarchy:seashell_patch"],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:has_rare_seashell",
|
||||
"features": ["antarchy:seashell_patch_rare"],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:has_shellstone",
|
||||
"features": [
|
||||
"antarchy:shellstone_upper",
|
||||
"antarchy:shellstone_lower"
|
||||
],
|
||||
"step": "underground_ores"
|
||||
}
|
||||
Reference in new issue
Block a user