diff --git a/common/build.gradle b/common/build.gradle index 2d4e3714..26b5e534 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -27,7 +27,12 @@ dependencies { // compileOnly(files("$rootDir/infinite_dimensions_jars/soul-fire-d-neoforge-1.21-6.1.0.jar")) // compileOnly(files("$rootDir/infinite_dimensions_jars/prometheus-neoforge-1.21-1.2.5.jar")) compileOnly(files("$rootDir/infinite_dimensions_jars/sable-neoforge-1.21.1-2.0.3.jar")) - compileOnly(files("$rootDir/infinite_dimensions_jars/antarchy-1.0.0+1.21.1-neoforge.jar")) +// compileOnly(files("$rootDir/infinite_dimensions_jars/antarchy-1.0.0+1.21.1-neoforge.jar")) + // NeoForge jar (not fabric) — sizeable_foliage's fabric jar is intermediary-mapped + // (Fabric remaps to intermediary for shipping, not official names), which common's + // official-Mojang-mapped compile can't resolve directly. NeoForge jars use official + // names throughout, so this is the one common can safely compile against. + compileOnly(files("$rootDir/sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar")) compileOnly("software.bernie.geckolib:geckolib-neoforge-${minecraft_version}:${geckolib_version}") // // compileOnly group: 'org.ow2.asm', name: 'asm-tree', version: '9.4' diff --git a/common/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java b/common/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java index db23fffd..1af8f10f 100644 --- a/common/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java +++ b/common/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java @@ -162,7 +162,7 @@ public final class AntarchySettings { private static int basiliskSpawnMaxLightLevel = 5; private static double basiliskHealth = 150.0D; private static double basiliskAttackDamage = 36.0D; - private static double basiliskMovementSpeed = 0.225D; + private static double basiliskMovementSpeed = 0.18D; private static double basiliskArmor = 6.0D; private static double basiliskKnockbackResistance = 0.5D; private static double basiliskFollowRange = 28.0D; @@ -239,10 +239,10 @@ public final class AntarchySettings { private static final int reverieAmbientTargetMaxAgeTicks = 40; private static final int reverieAmbientPulseIntervalMinTicks = 12; private static final int reverieAmbientPulseIntervalMaxTicks = 19; - private static double emperorScorpionHealth = 400.0D; + private static double emperorScorpionHealth = 300.0D; private static double emperorScorpionAttackDamage = 28.0D; private static double emperorScorpionMovementSpeed = 0.384D; - private static double emperorScorpionArmor = 25.0D; + private static double emperorScorpionArmor = 22.0D; private static double emperorScorpionKnockbackResistance = 0.8D; private static double emperorScorpionFollowRange = 40.0D; private static int emperorScorpionXpReward = 25; @@ -490,6 +490,7 @@ public final class AntarchySettings { private static double herculesBeetleHealth = 500.0D; private static double herculesBeetleAttackDamage = 30.0D; private static double herculesBeetleChargeDamage = 40.0D; + private static double glimmerHealth = 20.0D; private AntarchySettings() { } @@ -2547,4 +2548,6 @@ public final class AntarchySettings { public static double herculesBeetleChargeDamage() { return herculesBeetleChargeDamage; } public static void setHerculesBeetleChargeDamage(double v) { herculesBeetleChargeDamage = v; } public static void setDorrieHealth(double v) { dorrieHealth = v; } + public static double glimmerHealth() { return glimmerHealth; } + public static void setGlimmerHealth(double v) { glimmerHealth = v; } } diff --git a/common/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java b/common/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java index b139b9da..20caefd9 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java @@ -99,6 +99,10 @@ public final class AntarchyObjects { @SuppressWarnings("unchecked") public static Supplier> HERCULES_BEETLE = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") + public static Supplier> GLIMMER = (Supplier>) UNBOUND; + @SuppressWarnings("unchecked") + public static Supplier> GLIMMERS_GRACE = (Supplier>) UNBOUND; + @SuppressWarnings("unchecked") public static Supplier CHEEP_ITEM = (Supplier) UNBOUND; @SuppressWarnings("unchecked") public static Supplier DUPLICATOR_LOG = (Supplier) UNBOUND; @@ -211,8 +215,6 @@ public final class AntarchyObjects { @SuppressWarnings("unchecked") public static Supplier PINK_MILKWEED = (Supplier) UNBOUND; @SuppressWarnings("unchecked") - public static Supplier TORCHFLOWER_BUSH = (Supplier) UNBOUND; - @SuppressWarnings("unchecked") public static Supplier BED_BUG_EGG = (Supplier) UNBOUND; @SuppressWarnings("unchecked") public static Supplier CREEPING_HORROR_EGGS = (Supplier) UNBOUND; @@ -319,7 +321,6 @@ public final class AntarchyObjects { Supplier mossyOuranwoodWood, Supplier orangeMilkweed, Supplier pinkMilkweed, - Supplier torchflowerBush, Supplier bedBugEggs, Supplier creepingHorrorEggs, Supplier lurkingTerrorEggs, @@ -413,7 +414,6 @@ public final class AntarchyObjects { MOSSY_OURANWOOD_WOOD = mossyOuranwoodWood; ORANGE_MILKWEED = orangeMilkweed; PINK_MILKWEED = pinkMilkweed; - TORCHFLOWER_BUSH = torchflowerBush; BED_BUG_EGG = bedBugEggs; CREEPING_HORROR_EGGS = creepingHorrorEggs; LURKING_TERROR_EGGS = lurkingTerrorEggs; @@ -444,6 +444,14 @@ public final class AntarchyObjects { HERCULES_BEETLE = supplier; } + public static void setGlimmer(Supplier> supplier) { + GLIMMER = supplier; + } + + public static void setGlimmersGrace(Supplier> supplier) { + GLIMMERS_GRACE = supplier; + } + public static BlockBehaviour.Properties shellstoneProperties() { return BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).requiresCorrectToolForDrops(); } diff --git a/common/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java b/common/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java index cc7c90ff..ae5cd781 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java @@ -94,6 +94,7 @@ public final class AntarchyTags { public static final TagKey REVERIE_DUPLICATION_ITEMS = TagKey.create(Registries.ITEM, id("reverie_duplication_items")); public static final TagKey HERCULES_BEETLE_FOOD = TagKey.create(Registries.ITEM, id("hercules_beetle_food")); public static final TagKey ROLLY_POLLY_FOOD = TagKey.create(Registries.ITEM, id("rolly_polly_food")); + public static final TagKey GLIMMER_FOOD = TagKey.create(Registries.ITEM, id("glimmer_food")); private Items() { } diff --git a/common/src/main/java/com/craisinlord/antarchy/content/GlimmerParticles.java b/common/src/main/java/com/craisinlord/antarchy/content/GlimmerParticles.java new file mode 100644 index 00000000..4be4e240 --- /dev/null +++ b/common/src/main/java/com/craisinlord/antarchy/content/GlimmerParticles.java @@ -0,0 +1,45 @@ +package com.craisinlord.antarchy.content; + +import net.minecraft.core.particles.DustParticleOptions; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public final class GlimmerParticles { + private static final int AMBIENT_INTERVAL_TICKS = 6; + private static final DustParticleOptions AMBIENT = new DustParticleOptions(new Vector3f(0.55F, 0.85F, 1.0F), 0.9F); + private static final DustParticleOptions TRAIL = new DustParticleOptions(new Vector3f(0.6F, 0.9F, 1.0F), 1.1F); + + private GlimmerParticles() { + } + + public static void tickAmbient(LivingEntity entity, boolean running) { + if (!(entity.level() instanceof ServerLevel serverLevel)) { + return; + } + if (!entity.isAlive() || entity.tickCount % AMBIENT_INTERVAL_TICKS != 0) { + return; + } + + int count = running ? 2 : 1; + serverLevel.sendParticles( + AMBIENT, + entity.getRandomX(0.6D), + entity.getY(0.3D) + entity.getBbHeight() * 0.6D, + entity.getRandomZ(0.6D), + count, + 0.15D, + 0.2D, + 0.15D, + 0.0D + ); + + Vec3 motion = entity.getDeltaMovement(); + if (running && motion.horizontalDistanceSqr() > 1.0E-4D) { + Vec3 direction = new Vec3(motion.x, 0.0D, motion.z).normalize(); + Vec3 behind = entity.position().subtract(direction.scale(0.4D)).add(0.0D, 0.15D, 0.0D); + serverLevel.sendParticles(TRAIL, behind.x, behind.y, behind.z, 1, 0.05D, 0.05D, 0.05D, 0.0D); + } + } +} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/block/BigBushPartBlock.java b/common/src/main/java/com/craisinlord/antarchy/content/block/BigBushPartBlock.java index a57ff233..56a0731e 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/block/BigBushPartBlock.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/block/BigBushPartBlock.java @@ -15,6 +15,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.BonemealableBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -31,7 +32,7 @@ import org.jetbrains.annotations.Nullable; * part directly two above the origin of a stage-3 bush renders the top slice of * the oversized cross model */ -public class BigBushPartBlock extends Block { +public class BigBushPartBlock extends Block implements BonemealableBlock { public static final MapCodec CODEC = Block.simpleCodec(BigBushPartBlock::new); public static final BooleanProperty CAP = BooleanProperty.create("cap"); @@ -123,6 +124,29 @@ public class BigBushPartBlock extends Block { } } + /** Bonemeal applied to any part of a growing bush grows the whole thing, same as clicking the origin. */ + @Override + public boolean isValidBonemealTarget(LevelReader level, BlockPos pos, BlockState state) { + BlockPos origin = findOrigin(level, pos); + return origin != null && level.getBlockState(origin).getBlock() instanceof BigBushBlock bigBush + && bigBush.isValidBonemealTarget(level, origin, level.getBlockState(origin)); + } + + @Override + public boolean isBonemealSuccess(Level level, RandomSource random, BlockPos pos, BlockState state) { + BlockPos origin = findOrigin(level, pos); + return origin != null && level.getBlockState(origin).getBlock() instanceof BigBushBlock bigBush + && bigBush.isBonemealSuccess(level, random, origin, level.getBlockState(origin)); + } + + @Override + public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pos, BlockState state) { + BlockPos origin = findOrigin(level, pos); + if (origin != null && level.getBlockState(origin).getBlock() instanceof BigBushBlock bigBush) { + bigBush.performBonemeal(level, random, origin, level.getBlockState(origin)); + } + } + @Override protected ItemInteractionResult useItemOn( ItemStack stack, diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/BigBushCameraHider.java b/common/src/main/java/com/craisinlord/antarchy/content/client/BigBushCameraHider.java deleted file mode 100644 index b91991b9..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/BigBushCameraHider.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.craisinlord.antarchy.content.client; - -import com.craisinlord.antarchy.content.block.BigBushBlock; -import com.craisinlord.antarchy.content.block.BigBushPartBlock; -import net.minecraft.client.Minecraft; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.Vec3; - -import java.util.Objects; - -public final class BigBushCameraHider { - private static BlockPos hiddenOrigin; - - private BigBushCameraHider() { - } - - public static void update(Minecraft mc) { - BlockPos newOrigin = null; - if (mc.level != null && mc.player != null) { - Vec3 cameraPos = mc.gameRenderer.getMainCamera().getPosition(); - BlockPos pos = BlockPos.containing(cameraPos); - BlockState state = mc.level.getBlockState(pos); - if (state.getBlock() instanceof BigBushBlock && state.getValue(BigBushBlock.AGE) > 0) { - newOrigin = pos; - } else if (state.getBlock() instanceof BigBushPartBlock) { - newOrigin = BigBushPartBlock.findOrigin(mc.level, pos); - } - } - if (!Objects.equals(newOrigin, hiddenOrigin)) { - BlockPos previous = hiddenOrigin; - hiddenOrigin = newOrigin; - markDirty(mc, previous); - markDirty(mc, newOrigin); - } - } - - private static void markDirty(Minecraft mc, BlockPos origin) { - if (origin != null && mc.levelRenderer != null) { - mc.levelRenderer.setBlocksDirty( - origin.getX() - 2, origin.getY() - 1, origin.getZ() - 2, - origin.getX() + 2, origin.getY() + 3, origin.getZ() + 2); - } - } - - public static boolean shouldFade(BlockPos pos) { - BlockPos origin = hiddenOrigin; - if (origin == null) { - return false; - } - return Math.abs(pos.getX() - origin.getX()) <= 1 - && Math.abs(pos.getZ() - origin.getZ()) <= 1 - && pos.getY() >= origin.getY() - && pos.getY() <= origin.getY() + 2; - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/BigBushRenderHelper.java b/common/src/main/java/com/craisinlord/antarchy/content/client/BigBushRenderHelper.java deleted file mode 100644 index 8a7f1aca..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/BigBushRenderHelper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.craisinlord.antarchy.content.client; - -import com.craisinlord.antarchy.content.block.BigBushBlock; -import com.craisinlord.antarchy.content.block.BigBushPartBlock; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -public final class BigBushRenderHelper { - private BigBushRenderHelper() { - } - - public static boolean isInsideBigBush(LivingEntity entity) { - Level level = entity.level(); - return isBush(level, entity.blockPosition()) || isBush(level, BlockPos.containing(entity.getEyePosition())); - } - - private static boolean isBush(Level level, BlockPos pos) { - BlockState state = level.getBlockState(pos); - if (state.getBlock() instanceof BigBushPartBlock) { - return true; - } - return state.getBlock() instanceof BigBushBlock && state.getValue(BigBushBlock.AGE) > 0; - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/model/EmperorScorpionModel.java b/common/src/main/java/com/craisinlord/antarchy/content/client/model/EmperorScorpionModel.java index c7dd6671..bc9e0f25 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/model/EmperorScorpionModel.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/client/model/EmperorScorpionModel.java @@ -6,6 +6,10 @@ import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; public class EmperorScorpionModel extends GeoModel { + public static final ResourceLocation NORMAL_TEXTURE = + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/emperor_scorpion/emperor_scorpion.png"); + public static final ResourceLocation HARDEN_TEXTURE = + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/emperor_scorpion/emperor_scorpion_harden.png"); public static final ResourceLocation EMISSIVE_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/emperor_scorpion/emperor_scorpion_emissive.png"); @@ -17,7 +21,7 @@ public class EmperorScorpionModel extends GeoModel { @Override public ResourceLocation getTextureResource(EmperorScorpionEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/emperor_scorpion/emperor_scorpion.png"); + return NORMAL_TEXTURE; } @Override diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/model/GlimmerModel.java b/common/src/main/java/com/craisinlord/antarchy/content/client/model/GlimmerModel.java new file mode 100644 index 00000000..b17874e3 --- /dev/null +++ b/common/src/main/java/com/craisinlord/antarchy/content/client/model/GlimmerModel.java @@ -0,0 +1,45 @@ +package com.craisinlord.antarchy.content.client.model; + +import com.craisinlord.antarchy.Antarchy; +import com.craisinlord.antarchy.content.entity.GlimmerEntity; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.model.GeoModel; + +public class GlimmerModel extends GeoModel { + private static final ResourceLocation ADULT_GEO = rl("geo/glimmer.geo.json"); + private static final ResourceLocation BABY_GEO = rl("geo/glimmer_baby.geo.json"); + private static final ResourceLocation ADULT_ANIM = rl("animations/glimmer.animation.json"); + private static final ResourceLocation BABY_ANIM = rl("animations/glimmer_baby.animation.json"); + private static final ResourceLocation ADULT_DAY = rl("textures/entity/glimmer/glimmer_day.png"); + private static final ResourceLocation ADULT_NIGHT = rl("textures/entity/glimmer/glimmer.png"); + private static final ResourceLocation BABY_DAY = rl("textures/entity/glimmer/glimmer_baby_day.png"); + private static final ResourceLocation BABY_NIGHT = rl("textures/entity/glimmer/glimmer_baby.png"); + public static final ResourceLocation ADULT_EMISSIVE = rl("textures/entity/glimmer/glimmer_emissive.png"); + public static final ResourceLocation BABY_EMISSIVE = rl("textures/entity/glimmer/glimmer_baby_emissive.png"); + + private static ResourceLocation rl(String path) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, path); + } + + @Override + public ResourceLocation getModelResource(GlimmerEntity animatable) { + return animatable.isBaby() ? BABY_GEO : ADULT_GEO; + } + + @Override + public ResourceLocation getAnimationResource(GlimmerEntity animatable) { + return animatable.isBaby() ? BABY_ANIM : ADULT_ANIM; + } + + @Override + public ResourceLocation getTextureResource(GlimmerEntity animatable) { + return textureFor(animatable, animatable.getGlowBlend(0.0F) >= 0.5F); + } + + public static ResourceLocation textureFor(GlimmerEntity animatable, boolean glowing) { + if (animatable.isBaby()) { + return glowing ? BABY_NIGHT : BABY_DAY; + } + return glowing ? ADULT_NIGHT : ADULT_DAY; + } +} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/model/NightmareModel.java b/common/src/main/java/com/craisinlord/antarchy/content/client/model/NightmareModel.java index a412667a..0b88a76c 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/model/NightmareModel.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/client/model/NightmareModel.java @@ -6,6 +6,9 @@ import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; public class NightmareModel extends GeoModel { + public static final ResourceLocation EMISSIVE_TEXTURE = + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/nightmare_emissive.png"); + @Override public ResourceLocation getModelResource(NightmareEntity animatable) { return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/nightmare.geo.json"); diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/model/SpitBugModel.java b/common/src/main/java/com/craisinlord/antarchy/content/client/model/SpitBugModel.java deleted file mode 100644 index a051572b..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/model/SpitBugModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.craisinlord.antarchy.content.client.model; - -import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.entity.SpitBugEntity; -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.model.GeoModel; - -public class SpitBugModel extends GeoModel { - @Override - public ResourceLocation getModelResource(SpitBugEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/spit_bug.geo.json"); - } - - @Override - public ResourceLocation getTextureResource(SpitBugEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/spit_bug.png"); - } - - @Override - public ResourceLocation getAnimationResource(SpitBugEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/spit_bug.animation.json"); - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/EmperorScorpionRenderer.java b/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/EmperorScorpionRenderer.java index 340a1bc4..e868babb 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/EmperorScorpionRenderer.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/EmperorScorpionRenderer.java @@ -4,6 +4,8 @@ import com.craisinlord.antarchy.content.client.model.EmperorScorpionModel; import com.craisinlord.antarchy.content.entity.EmperorScorpionEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import java.util.HashMap; +import java.util.Map; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRendererProvider; @@ -15,13 +17,22 @@ import software.bernie.geckolib.renderer.GeoEntityRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class EmperorScorpionRenderer extends GeoEntityRenderer { + private static final int CROSSFADE_TICKS = 12; + private final Map transitions = new HashMap<>(); public EmperorScorpionRenderer(EntityRendererProvider.Context context) { super(context, new EmperorScorpionModel()); this.shadowRadius = 3.0F; + this.addRenderLayer(new EmperorScorpionHardenLayer(this)); this.addRenderLayer(new EmperorScorpionEmissiveLayer(this)); } + @Override + public void render(EmperorScorpionEntity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + this.updateTransition(entity); + super.render(entity, entityYaw, partialTick, poseStack, bufferSource, packedLight); + } + @Override public RenderType getRenderType(EmperorScorpionEntity animatable, ResourceLocation texture, @Nullable MultiBufferSource bufferSource, float partialTick) { return RenderType.entityCutoutNoCull(texture); @@ -57,4 +68,76 @@ public class EmperorScorpionRenderer extends GeoEntityRenderer + new HardenTransitionState(phase, entity.tickCount)); + + if (state.currentPhase != phase) { + state.currentPhase = phase; + state.transitionStartTick = entity.tickCount; + } else if (phase == 0 + && entity.tickCount - state.transitionStartTick > CROSSFADE_TICKS) { + this.transitions.remove(entity.getId()); + } + } + + private float getHardenAlpha(EmperorScorpionEntity entity, float partialTick) { + HardenTransitionState state = this.transitions.get(entity.getId()); + if (state == null) { + return 0.0F; + } + + float elapsed = (entity.tickCount - state.transitionStartTick) + partialTick; + return switch (state.currentPhase) { + case 2 -> Math.max(0.0F, Math.min(1.0F, elapsed / 11.0F)); + case 3 -> 1.0F; + case 4 -> Math.max(0.0F, Math.min(1.0F, 1.0F - (elapsed / 20.0F))); + default -> 0.0F; + }; + } + + private static final class HardenTransitionState { + private int currentPhase; + private int transitionStartTick; + + private HardenTransitionState(int currentPhase, int transitionStartTick) { + this.currentPhase = currentPhase; + this.transitionStartTick = transitionStartTick; + } + } + + private static final class EmperorScorpionHardenLayer extends GeoRenderLayer { + private EmperorScorpionHardenLayer(EmperorScorpionRenderer renderer) { + super(renderer); + } + + @Override + public void render(PoseStack poseStack, EmperorScorpionEntity animatable, BakedGeoModel bakedModel, @Nullable RenderType renderType, + MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, float partialTick, + int packedLight, int packedOverlay) { + EmperorScorpionRenderer renderer = (EmperorScorpionRenderer) this.getRenderer(); + float alpha = renderer.getHardenAlpha(animatable, partialTick); + if (alpha <= 0.0F) { + return; + } + + RenderType hardenType = RenderType.entityTranslucent(EmperorScorpionModel.HARDEN_TEXTURE); + VertexConsumer hardenBuffer = bufferSource.getBuffer(hardenType); + int color = ((Math.max(0, Math.min(255, Math.round(alpha * 255.0F))) & 0xFF) << 24) | 0x00FFFFFF; + this.getRenderer().reRender( + bakedModel, + poseStack, + bufferSource, + animatable, + hardenType, + hardenBuffer, + partialTick, + packedLight, + packedOverlay, + color + ); + } + } } diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/GlimmerRenderer.java b/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/GlimmerRenderer.java new file mode 100644 index 00000000..65e3344c --- /dev/null +++ b/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/GlimmerRenderer.java @@ -0,0 +1,108 @@ +package com.craisinlord.antarchy.content.client.renderer; + +import com.craisinlord.antarchy.content.client.model.GlimmerModel; +import com.craisinlord.antarchy.content.entity.GlimmerEntity; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.renderer.GeoEntityRenderer; +import software.bernie.geckolib.renderer.layer.GeoRenderLayer; + +public class GlimmerRenderer extends GeoEntityRenderer { + private static final float SHADOW_RADIUS = 0.5F; + + public GlimmerRenderer(EntityRendererProvider.Context context) { + super(context, new GlimmerModel()); + this.shadowRadius = SHADOW_RADIUS; + this.addRenderLayer(new GlimmerCrossfadeLayer(this)); + this.addRenderLayer(new GlimmerEmissiveLayer(this)); + } + + @Override + public RenderType getRenderType(GlimmerEntity animatable, ResourceLocation texture, @Nullable MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(texture); + } + + @Override + public void preRender(PoseStack poseStack, GlimmerEntity animatable, BakedGeoModel model, @Nullable MultiBufferSource bufferSource, + @Nullable VertexConsumer buffer, boolean isReRender, float partialTick, int packedLight, int packedOverlay, int colour) { + super.preRender(poseStack, animatable, model, bufferSource, buffer, isReRender, partialTick, packedLight, packedOverlay, colour); + this.shadowRadius = SHADOW_RADIUS; + } + + private static final class GlimmerCrossfadeLayer extends GeoRenderLayer { + private GlimmerCrossfadeLayer(GeoEntityRenderer renderer) { + super(renderer); + } + + @Override + public void render(PoseStack poseStack, GlimmerEntity animatable, BakedGeoModel bakedModel, @Nullable RenderType renderType, + MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, float partialTick, + int packedLight, int packedOverlay) { + float glowBlend = animatable.getGlowBlend(partialTick); + if (glowBlend <= 0.0F || glowBlend >= 1.0F) { + return; + } + + boolean baseGlowing = glowBlend >= 0.5F; + float overlayAlpha = baseGlowing ? 1.0F - glowBlend : glowBlend; + if (overlayAlpha <= 0.0F) { + return; + } + + ResourceLocation overlayTexture = GlimmerModel.textureFor(animatable, !baseGlowing); + RenderType overlayType = RenderType.entityTranslucent(overlayTexture); + VertexConsumer overlayBuffer = bufferSource.getBuffer(overlayType); + int color = ((Math.max(0, Math.min(255, Math.round(overlayAlpha * 255.0F))) & 0xFF) << 24) | 0x00FFFFFF; + this.getRenderer().reRender( + bakedModel, + poseStack, + bufferSource, + animatable, + overlayType, + overlayBuffer, + partialTick, + packedLight, + packedOverlay, + color + ); + } + } + + private static final class GlimmerEmissiveLayer extends GeoRenderLayer { + private GlimmerEmissiveLayer(GeoEntityRenderer renderer) { + super(renderer); + } + + @Override + public void render(PoseStack poseStack, GlimmerEntity animatable, BakedGeoModel bakedModel, @Nullable RenderType renderType, + MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, float partialTick, + int packedLight, int packedOverlay) { + if (!animatable.isGlowingState()) { + return; + } + + ResourceLocation texture = animatable.isBaby() ? GlimmerModel.BABY_EMISSIVE : GlimmerModel.ADULT_EMISSIVE; + RenderType emissiveType = RenderType.eyes(texture); + VertexConsumer emissiveBuffer = bufferSource.getBuffer(emissiveType); + this.getRenderer().reRender( + bakedModel, + poseStack, + bufferSource, + animatable, + emissiveType, + emissiveBuffer, + partialTick, + 0xF000F0, + OverlayTexture.NO_OVERLAY, + 0xFFFFFFFF + ); + } + } +} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/NightmareRenderer.java b/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/NightmareRenderer.java index dc0d0786..87bfce1e 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/NightmareRenderer.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/NightmareRenderer.java @@ -2,18 +2,53 @@ package com.craisinlord.antarchy.content.client.renderer; import com.craisinlord.antarchy.content.client.model.NightmareModel; import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.texture.OverlayTexture; +import org.jetbrains.annotations.Nullable; +import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.renderer.GeoEntityRenderer; +import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class NightmareRenderer extends GeoEntityRenderer { public NightmareRenderer(EntityRendererProvider.Context context) { super(context, new NightmareModel()); this.shadowRadius = 1.8F; this.withScale(1.15F); + this.addRenderLayer(new NightmareEmissiveLayer(this)); } @Override protected float getDeathMaxRotation(NightmareEntity animatable) { return 0.0F; } + + private static final class NightmareEmissiveLayer extends GeoRenderLayer { + private NightmareEmissiveLayer(GeoEntityRenderer renderer) { + super(renderer); + } + + @Override + public void render(PoseStack poseStack, NightmareEntity animatable, BakedGeoModel bakedModel, @Nullable RenderType renderType, + MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, float partialTick, + int packedLight, int packedOverlay) { + RenderType emissiveType = RenderType.eyes(NightmareModel.EMISSIVE_TEXTURE); + VertexConsumer emissiveBuffer = bufferSource.getBuffer(emissiveType); + this.getRenderer().reRender( + bakedModel, + poseStack, + bufferSource, + animatable, + emissiveType, + emissiveBuffer, + partialTick, + 0xF000F0, + OverlayTexture.NO_OVERLAY, + 0xFFFFFFFF + ); + } + } } diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpitBugProjectileRenderer.java b/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpitBugProjectileRenderer.java deleted file mode 100644 index 7b9fbedd..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpitBugProjectileRenderer.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.craisinlord.antarchy.content.client.renderer; - -import com.craisinlord.antarchy.content.entity.SpitBugProjectileEntity; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; -import org.joml.Matrix4f; - -public class SpitBugProjectileRenderer extends EntityRenderer { - private static final ResourceLocation PROJECTILE_TEXTURE = - ResourceLocation.withDefaultNamespace("textures/entity/enderdragon/dragon_fireball.png"); - - public SpitBugProjectileRenderer(EntityRendererProvider.Context context) { - super(context); - } - - @Override - protected int getBlockLightLevel(SpitBugProjectileEntity entity, BlockPos pos) { - return 15; - } - - @Override - public void render(SpitBugProjectileEntity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource buffer, int packedLight) { - poseStack.pushPose(); - poseStack.mulPose(this.entityRenderDispatcher.cameraOrientation()); - - float scale = entity.getRenderScale(partialTick); - poseStack.scale(scale, scale, scale); - - VertexConsumer vertexConsumer = buffer.getBuffer(RenderType.entityTranslucent(PROJECTILE_TEXTURE)); - PoseStack.Pose pose = poseStack.last(); - Matrix4f matrix4f = pose.pose(); - float alpha = entity.isLingering() ? 0.78F : 0.95F; - - addVertex(vertexConsumer, pose, matrix4f, -0.5F, -0.5F, 0.0F, 1.0F, alpha, packedLight); - addVertex(vertexConsumer, pose, matrix4f, 0.5F, -0.5F, 1.0F, 1.0F, alpha, packedLight); - addVertex(vertexConsumer, pose, matrix4f, 0.5F, 0.5F, 1.0F, 0.0F, alpha, packedLight); - addVertex(vertexConsumer, pose, matrix4f, -0.5F, 0.5F, 0.0F, 0.0F, alpha, packedLight); - - poseStack.popPose(); - super.render(entity, entityYaw, partialTick, poseStack, buffer, packedLight); - } - - private static void addVertex( - VertexConsumer vertexConsumer, - PoseStack.Pose pose, - Matrix4f matrix4f, - float x, - float y, - float u, - float v, - float alpha, - int packedLight - ) { - vertexConsumer.addVertex(matrix4f, x, y, 0.0F) - .setColor(0.55F, 1.0F, 0.35F, alpha) - .setUv(u, v) - .setOverlay(OverlayTexture.NO_OVERLAY) - .setLight(packedLight) - .setNormal(pose, 0.0F, 0.0F, 1.0F); - } - - @Override - public ResourceLocation getTextureLocation(SpitBugProjectileEntity entity) { - return PROJECTILE_TEXTURE; - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpitBugRenderer.java b/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpitBugRenderer.java deleted file mode 100644 index 34bae797..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpitBugRenderer.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.craisinlord.antarchy.content.client.renderer; - -import com.craisinlord.antarchy.content.client.model.SpitBugModel; -import com.craisinlord.antarchy.content.entity.SpitBugEntity; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import software.bernie.geckolib.renderer.GeoEntityRenderer; - -public class SpitBugRenderer extends GeoEntityRenderer { - public SpitBugRenderer(EntityRendererProvider.Context context) { - super(context, new SpitBugModel()); - this.shadowRadius = 1.6F; - this.withScale(0.85F); - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/effect/GlimmersGraceMobEffect.java b/common/src/main/java/com/craisinlord/antarchy/content/effect/GlimmersGraceMobEffect.java new file mode 100644 index 00000000..4a44f095 --- /dev/null +++ b/common/src/main/java/com/craisinlord/antarchy/content/effect/GlimmersGraceMobEffect.java @@ -0,0 +1,68 @@ +package com.craisinlord.antarchy.content.effect; + +import com.craisinlord.antarchy.Antarchy; +import com.craisinlord.antarchy.content.GlimmerParticles; +import net.minecraft.core.Holder; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeInstance; +import net.minecraft.world.entity.ai.attributes.AttributeMap; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; + +public final class GlimmersGraceMobEffect extends MobEffect { + private static final ResourceLocation SPEED_MODIFIER_ID = + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "glimmers_grace_speed"); + private static final ResourceLocation JUMP_MODIFIER_ID = + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "glimmers_grace_jump"); + private static final ResourceLocation FALL_DAMAGE_MODIFIER_ID = + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "glimmers_grace_fall_damage"); + + public GlimmersGraceMobEffect() { + super(MobEffectCategory.BENEFICIAL, 0x7FDBFF); + } + + @Override + public void addAttributeModifiers(AttributeMap attributeMap, int amplifier) { + addModifier(attributeMap, Attributes.MOVEMENT_SPEED, SPEED_MODIFIER_ID, 0.35D * (amplifier + 1)); + addModifier(attributeMap, Attributes.JUMP_STRENGTH, JUMP_MODIFIER_ID, 0.5D * (amplifier + 1)); + addModifier(attributeMap, Attributes.FALL_DAMAGE_MULTIPLIER, FALL_DAMAGE_MODIFIER_ID, -0.6D * (amplifier + 1)); + } + + @Override + public void removeAttributeModifiers(AttributeMap attributeMap) { + removeModifier(attributeMap, Attributes.MOVEMENT_SPEED, SPEED_MODIFIER_ID); + removeModifier(attributeMap, Attributes.JUMP_STRENGTH, JUMP_MODIFIER_ID); + removeModifier(attributeMap, Attributes.FALL_DAMAGE_MULTIPLIER, FALL_DAMAGE_MODIFIER_ID); + } + + @Override + public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) { + return true; + } + + @Override + public boolean applyEffectTick(LivingEntity livingEntity, int amplifier) { + GlimmerParticles.tickAmbient(livingEntity, livingEntity.getDeltaMovement().horizontalDistanceSqr() > 0.01D); + return true; + } + + private static void addModifier(AttributeMap attributeMap, Holder attribute, ResourceLocation id, double amount) { + AttributeInstance instance = attributeMap.getInstance(attribute); + if (instance == null) { + return; + } + instance.addTransientModifier(new AttributeModifier(id, amount, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL)); + } + + private static void removeModifier(AttributeMap attributeMap, Holder attribute, ResourceLocation id) { + AttributeInstance instance = attributeMap.getInstance(attribute); + if (instance == null) { + return; + } + instance.removeModifier(id); + } +} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/DorrieEntity.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/DorrieEntity.java index 09cc8fed..67a28023 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/entity/DorrieEntity.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/entity/DorrieEntity.java @@ -68,7 +68,7 @@ public class DorrieEntity extends Animal implements GeoEntity { SynchedEntityData.defineId(DorrieEntity.class, EntityDataSerializers.INT); private static final int MAX_CHARGE_TICKS = 40; - private static final float WATER_RIDE_SPEED = 1.84F; + private static final float WATER_RIDE_SPEED = 0.78F; private static final float LAND_BEACH_SPEED = 0.10F; private static final int QUIRK_DURATION_TICKS = 65; private static final int MIN_QUIRK_COOLDOWN_TICKS = 140; @@ -277,13 +277,16 @@ public class DorrieEntity extends Animal implements GeoEntity { public void tick() { super.tick(); this.updateNavigationMode(); - this.setNoGravity(this.isInWater() || this.isInLava()); + this.setNoGravity(false); if (this.getControllingPassenger() instanceof Player player) { this.setYRot(player.getYRot()); this.yRotO = this.getYRot(); this.yBodyRot = this.getYRot(); this.yHeadRot = this.getYRot(); + if (this.getQuirkTicks() > 0) { + this.setQuirkTicks(0); + } if (this.isInWater() || this.isInLava()) { if (player.zza > 0.05F) { this.swimForwardTicks = Math.min(this.swimForwardTicks + 1, 60); @@ -365,7 +368,14 @@ public class DorrieEntity extends Animal implements GeoEntity { if (this.isInWater() || this.isInLava()) { this.moveRelative(this.getSpeed(), new Vec3(riddenInput.x, 0.0D, riddenInput.z)); Vec3 motion = this.getDeltaMovement(); - double vertical = this.isLeaping ? 0.0D : riddenInput.y * 0.09D; + double vertical = 0.0D; + if (!this.isLeaping) { + if (this.isUnderWater()) { + vertical = riddenInput.y * 0.025D; + } else if (riddenInput.y < 0.0D) { + vertical = riddenInput.y * 0.02D; + } + } this.setDeltaMovement( motion.x * 0.92D, motion.y * 0.90D + vertical, @@ -374,10 +384,6 @@ public class DorrieEntity extends Animal implements GeoEntity { this.move(net.minecraft.world.entity.MoverType.SELF, this.getDeltaMovement()); return; } - - this.moveRelative(this.getSpeed(), new Vec3(riddenInput.x, 0.0D, riddenInput.z)); - this.move(net.minecraft.world.entity.MoverType.SELF, this.getDeltaMovement()); - return; } super.travel(travelVector); @@ -410,9 +416,9 @@ public class DorrieEntity extends Animal implements GeoEntity { if (this.hasPassenger(passenger)) { Vec3 forward = this.getLookAngle().multiply(1.0D, 0.0D, 1.0D); moveFunction.accept(passenger, - this.getX() - forward.x * 0.25D, + this.getX() - forward.x * 0.65D, this.getY() + 0.5D, - this.getZ() - forward.z * 0.25D); + this.getZ() - forward.z * 0.65D); } } @@ -478,16 +484,18 @@ public class DorrieEntity extends Animal implements GeoEntity { } boolean moving = this.isMovingForAnimation(state); + if (this.onGround()) { + if (moving) { + state.getController().setAnimationSpeed(0.75D); + return state.setAndContinue(WALK_ANIM); + } + return state.setAndContinue(IDLE_GROUND_ANIM); + } + if (this.isInWater() || this.isInLava()) { return state.setAndContinue(moving ? SWIM_ANIM : IDLE_WATER_ANIM); } - - if (moving) { - state.getController().setAnimationSpeed(0.75D); - return state.setAndContinue(WALK_ANIM); - } - - return state.setAndContinue(IDLE_GROUND_ANIM); + return state.setAndContinue(moving ? SWIM_ANIM : IDLE_GROUND_ANIM); } @Override diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/EmperorScorpionEntity.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/EmperorScorpionEntity.java index 421c14de..258f42eb 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/entity/EmperorScorpionEntity.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/entity/EmperorScorpionEntity.java @@ -1,42 +1,49 @@ package com.craisinlord.antarchy.content.entity; -import com.craisinlord.antarchy.content.AntarchySoundEvents; import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.AntarchyObjects; import com.craisinlord.antarchy.config.AntarchySettings; +import com.craisinlord.antarchy.content.AntarchySoundEvents; +import com.craisinlord.antarchy.content.AntarchyObjects; import com.craisinlord.antarchy.content.damage.AntarchyDamageSources; +import com.craisinlord.antarchy.content.entity.ScorpionEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.Registries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerBossEvent; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; import net.minecraft.util.RandomSource; -import net.minecraft.world.Difficulty; import net.minecraft.world.BossEvent; +import net.minecraft.world.Difficulty; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.goal.FloatGoal; -import net.minecraft.world.entity.ai.goal.MeleeAttackGoal; +import net.minecraft.world.entity.ai.goal.Goal; import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal; import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal; import net.minecraft.world.entity.ai.goal.RandomStrollGoal; import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal; import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.DifficultyInstance; import net.minecraft.world.entity.monster.Monster; -import net.minecraft.world.level.levelgen.Heightmap; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraft.world.entity.player.Player; +import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.Nullable; import software.bernie.geckolib.animatable.GeoEntity; import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache; @@ -47,53 +54,75 @@ import software.bernie.geckolib.animation.PlayState; import software.bernie.geckolib.animation.RawAnimation; import software.bernie.geckolib.util.GeckoLibUtil; -public class EmperorScorpionEntity extends Monster implements GeoEntity { - private static final byte SNAP_ATTACK_ANIM_EVENT = 4; - private static final byte STING_ATTACK_ANIM_EVENT = 5; - private static final byte AGRO_ANIM_EVENT = 6; +import java.util.EnumSet; + +public class EmperorScorpionEntity extends Monster implements GeoEntity { + private static final byte CLAW_ATTACK_EVENT = 4; + private static final byte STING_ATTACK_EVENT = 5; + private static final EntityDataAccessor ANIMATION_STATE = + SynchedEntityData.defineId(EmperorScorpionEntity.class, EntityDataSerializers.INT); + private static final EntityDataAccessor HARDEN_PHASE = + SynchedEntityData.defineId(EmperorScorpionEntity.class, EntityDataSerializers.INT); - private static final int SNAP_ATTACK_ANIM_TICKS = 23; - private static final int SNAP_ATTACK_HIT_TICK = 12; - private static final int SNAP_ATTACK_COOLDOWN_TICKS = 28; - private static final int STING_ATTACK_ANIM_TICKS = 25; - private static final int STING_ATTACK_HIT_TICK = 13; - private static final int STING_ATTACK_COOLDOWN_TICKS = 60; - private static final int AGRO_ANIM_TICKS = 30; private static final int DEATH_ANIM_TICKS = 40; - private static final float STING_DAMAGE = 18.0F; - private static final double STING_AOE_RADIUS = 5.0D; - private static final int POISON_DURATION_TICKS = 300; - private static final int WEAKNESS_DURATION_TICKS = 120; - private static final int SUMMON_INTERVAL_TICKS = 140; - private static final int MAX_SUMMONED_SCORPIONS = 8; - private static final String EMPEROR_SUMMON_TAG = "antarchy_emperor_summoned"; + private static final int ANIM_IDLE = 0; + private static final int ANIM_WALK = 1; + private static final int ANIM_CLAW_ATTACK = 2; + private static final int ANIM_STING_ATTACK = 3; + private static final int ANIM_DEATH = 4; + private static final int ANIM_HARDEN_START = 5; + private static final int ANIM_HARDEN_ACTIVE = 6; + private static final int ANIM_HARDEN_END = 7; + private static final double CLAW_LUNGE_SPEED = 0.12D; + private static final double CLAW_LUNGE_LIFT = 0.02D; + private static final double STING_LUNGE_SPEED = 0.08D; + private static final double STING_LUNGE_LIFT = 0.01D; + private static final double CLAW_RANGE = 5.25D; + private static final double STING_RANGE = 5.75D; + private static final int HARDEN_START_TICKS = 11; + private static final int HARDEN_END_TICKS = 20; + private static final int HARDEN_HEAL_INTERVAL_TICKS = 20; + private static final float HARDEN_HEAL_AMOUNT = 2.0F; + private static final int HARDEN_MIN_DURATION_TICKS = 100; + private static final int HARDEN_MAX_DURATION_TICKS = 200; private static final ResourceKey THORAXIS_KEY = ResourceKey.create(Registries.DIMENSION, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "thoraxis")); - private static final RawAnimation IDLE_ANIM = RawAnimation.begin().thenLoop("idle"); - private static final RawAnimation WALK_ANIM = RawAnimation.begin().thenLoop("walk"); - private static final RawAnimation SNAP_ANIM = RawAnimation.begin().thenPlay("snap"); - private static final RawAnimation STING_ANIM = RawAnimation.begin().thenPlay("sting"); - private static final RawAnimation AGRO_ANIM = RawAnimation.begin().thenPlay("agro"); + private static final RawAnimation IDLE_ANIM = RawAnimation.begin().thenLoop("idle"); + private static final RawAnimation WALK_ANIM = RawAnimation.begin().thenLoop("walk"); + private static final RawAnimation CLAW_ATTACK_ANIM = RawAnimation.begin().thenPlay("snap"); + private static final RawAnimation STING_ATTACK_ANIM = RawAnimation.begin().thenPlay("sting"); + private static final RawAnimation HARDEN_START_ANIM = RawAnimation.begin().thenPlay("harden"); + private static final RawAnimation HARDEN_ACTIVE_ANIM = RawAnimation.begin().thenLoop("harden_state"); + private static final RawAnimation HARDEN_END_ANIM = RawAnimation.begin().thenPlay("end_of_harden_state"); private static final RawAnimation DEATH_ANIM = RawAnimation.begin().thenPlay("death"); private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); private final ServerBossEvent bossEvent = new ServerBossEvent(this.getDisplayName(), BossEvent.BossBarColor.PURPLE, BossEvent.BossBarOverlay.PROGRESS); - private int attackAnimTicks = 0; - private int stingCooldownTicks = 0; - private int agroAnimTicks = 0; - private int summonCooldown = 0; - private boolean attackDamageApplied = false; - private boolean stingAttackActive = false; - private boolean hasAgroed = false; + private int attackAnimTicks; + private int clawCooldownTicks; + private int stingCooldownTicks; + private int hardenCooldownTicks = AntarchySettings.emperorScorpionSummonIntervalTicks(); + private int hardenCastTicks; + private int hardenCastSpawnTicks; + private int hardenStateTicks; + private int hardenDurationTicks; + private int hardenHealTicks; + private int hardenSummonedScorpions; + private float hardenLockedYaw; + private float hardenLockedPitch; + private boolean attackDamageApplied; + private AttackType currentAttack = AttackType.NONE; + private HardenPhase hardenPhase = HardenPhase.NONE; + @Nullable private LivingEntity attackTarget; public EmperorScorpionEntity(EntityType entityType, Level level) { super(entityType, level); - this.xpReward = 25; + this.xpReward = AntarchySettings.emperorScorpionXpReward(); this.bossEvent.setDarkenScreen(false); } @@ -108,11 +137,42 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity { .add(Attributes.FOLLOW_RANGE, AntarchySettings.emperorScorpionFollowRange()); } + @Override + protected void defineSynchedData(SynchedEntityData.Builder builder) { + super.defineSynchedData(builder); + builder.define(ANIMATION_STATE, ANIM_IDLE); + builder.define(HARDEN_PHASE, HardenPhase.NONE.ordinal()); + } + + @Override + protected void registerGoals() { + this.goalSelector.addGoal(0, new FloatGoal(this)); + this.goalSelector.addGoal(1, new EmperorScorpionCombatGoal()); + this.goalSelector.addGoal(5, new RandomStrollGoal(this, 0.8D)); + this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 12.0F)); + this.goalSelector.addGoal(7, new RandomLookAroundGoal(this)); + this.targetSelector.addGoal(1, new HurtByTargetGoal(this)); + this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true)); + } + @Override public boolean fireImmune() { return true; } + @Override + public boolean hurt(DamageSource source, float amount) { + if (this.isHardenedStateActive()) { + return false; + } + return super.hurt(source, amount); + } + + @Override + public boolean isInvulnerableTo(DamageSource source) { + return this.isHardenedStateActive() || super.isInvulnerableTo(source); + } + @Override public void lavaHurt() { } @@ -131,47 +191,6 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity { && Monster.checkMonsterSpawnRules(entityType, level, spawnReason, pos, random); } - @Override - protected void registerGoals() { - this.goalSelector.addGoal(0, new FloatGoal(this)); - this.goalSelector.addGoal(1, new MeleeAttackGoal(this, 1.2D, true)); - this.goalSelector.addGoal(5, new RandomStrollGoal(this, 0.8D) { - @Override - public boolean canUse() { - return !EmperorScorpionEntity.this.isInCombat() && super.canUse(); - } - - @Override - public boolean canContinueToUse() { - return !EmperorScorpionEntity.this.isInCombat() && super.canContinueToUse(); - } - }); - this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 12.0F) { - @Override - public boolean canUse() { - return !EmperorScorpionEntity.this.isInCombat() && super.canUse(); - } - - @Override - public boolean canContinueToUse() { - return !EmperorScorpionEntity.this.isInCombat() && super.canContinueToUse(); - } - }); - this.goalSelector.addGoal(7, new RandomLookAroundGoal(this) { - @Override - public boolean canUse() { - return !EmperorScorpionEntity.this.isInCombat() && super.canUse(); - } - - @Override - public boolean canContinueToUse() { - return !EmperorScorpionEntity.this.isInCombat() && super.canContinueToUse(); - } - }); - this.targetSelector.addGoal(1, new HurtByTargetGoal(this)); - this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true)); - } - @Override public float maxUpStep() { return 1.5F; @@ -179,157 +198,260 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity { @Override public int getMaxHeadYRot() { - return 35; + return 40; } @Override public void tick() { super.tick(); this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth()); + + if (this.clawCooldownTicks > 0) { + this.clawCooldownTicks--; + } if (this.stingCooldownTicks > 0) { this.stingCooldownTicks--; } + if (this.hardenCooldownTicks > 0) { + this.hardenCooldownTicks--; + } if (this.attackAnimTicks > 0) { + if (!this.level().isClientSide) { + this.tickActiveAttack(); + } this.attackAnimTicks--; if (this.attackAnimTicks <= 0) { - this.attackDamageApplied = false; - this.stingAttackActive = false; + this.resetAttackState(); } } - if (this.agroAnimTicks > 0) { - this.agroAnimTicks--; - } - if (this.summonCooldown > 0) { - this.summonCooldown--; - } - if (!this.level().isClientSide) { - if (this.getTarget() != null) { - if (!this.hasAgroed) { - this.hasAgroed = true; - this.agroAnimTicks = AGRO_ANIM_TICKS; - this.getNavigation().stop(); - this.level().broadcastEntityEvent(this, AGRO_ANIM_EVENT); - this.playSound(AntarchySoundEvents.EMPEROR_SCORPION_ROAR.get(), 2.0F, 0.7F); - } - } else { - this.hasAgroed = false; - } + this.tickHardenState(); } - if (this.getTarget() != null - && this.summonCooldown <= 0 - && !this.isAttackLocked() - && this.getHealth() <= this.getMaxHealth() * 0.75F - && this.level() instanceof ServerLevel serverLevel) { - this.trySummonScorpions(serverLevel); - } - } - - private void trySummonScorpions(ServerLevel serverLevel) { - long nearby = serverLevel.getEntitiesOfClass(ScorpionEntity.class, this.getBoundingBox().inflate(16.0D), - scorpion -> scorpion.getTags().contains(EMPEROR_SUMMON_TAG)).size(); - this.summonCooldown = SUMMON_INTERVAL_TICKS; - if (nearby >= MAX_SUMMONED_SCORPIONS) { - return; - } - - int toSpawn = 2 + this.random.nextInt(2); - EntityType scorpionType = AntarchyObjects.SCORPION.get(); - for (int i = 0; i < toSpawn; i++) { - double offsetX = (this.random.nextDouble() - 0.5D) * 6.0D; - double offsetZ = (this.random.nextDouble() - 0.5D) * 6.0D; - BlockPos xzPos = BlockPos.containing(this.getX() + offsetX, 0, this.getZ() + offsetZ); - BlockPos spawnPos = serverLevel.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, xzPos); - @Nullable ScorpionEntity scorpion = scorpionType.create(serverLevel); - if (scorpion == null) continue; - scorpion.moveTo(spawnPos.getX() + 0.5D, spawnPos.getY(), spawnPos.getZ() + 0.5D, - this.getYRot(), 0.0F); - scorpion.addTag(EMPEROR_SUMMON_TAG); - scorpion.setTarget(this.getTarget()); - scorpion.finalizeSpawn(serverLevel, - serverLevel.getCurrentDifficultyAt(spawnPos), - MobSpawnType.MOB_SUMMONED, null); - serverLevel.addFreshEntity(scorpion); - } - this.playSound(AntarchySoundEvents.EMPEROR_SCORPION_ROAR.get(), 1.2F, 0.75F); + this.updateAnimationState(); } @Override public boolean doHurtTarget(Entity target) { boolean hurt = super.doHurtTarget(target); - if (hurt) { - boolean usedSting = false; - if (target instanceof LivingEntity livingTarget && this.shouldUseSting(livingTarget)) { - this.stingAttackActive = true; - this.attackAnimTicks = STING_ATTACK_ANIM_TICKS; - this.attackDamageApplied = false; - this.level().broadcastEntityEvent(this, STING_ATTACK_ANIM_EVENT); - usedSting = this.performStingAttack(livingTarget); - if (usedSting) { - this.stingCooldownTicks = STING_ATTACK_COOLDOWN_TICKS; - } + if (!hurt) { + return false; + } + this.playSound(AntarchySoundEvents.EMPEROR_SCORPION_ATTACK.get(), 0.9F, 0.95F + this.random.nextFloat() * 0.08F); + return true; + } + + private boolean doStingAttack(LivingEntity target) { + boolean hurt; + if (this.level() instanceof net.minecraft.server.level.ServerLevel serverLevel) { + hurt = target.hurt( + AntarchyDamageSources.emperorScorpionSting(serverLevel, this), + (float) this.getAttributeValue(Attributes.ATTACK_DAMAGE) + ); + } else { + hurt = target.hurt(this.damageSources().mobAttack(this), (float) this.getAttributeValue(Attributes.ATTACK_DAMAGE)); + } + + if (!hurt) { + return false; + } + + int poisonDuration = this.level().getDifficulty() == Difficulty.HARD + ? AntarchySettings.emperorScorpionPoisonTicks() * 2 + : AntarchySettings.emperorScorpionPoisonTicks(); + target.addEffect(new MobEffectInstance(MobEffects.POISON, poisonDuration, 1)); + target.addEffect(new MobEffectInstance(MobEffects.WEAKNESS, AntarchySettings.emperorScorpionWeaknessTicks(), 0)); + this.playSound(AntarchySoundEvents.EMPEROR_SCORPION_ATTACK.get(), 1.0F, 0.88F + this.random.nextFloat() * 0.08F); + return true; + } + + private void beginAttack(LivingEntity target, AttackType attackType) { + if (this.isHardenSequenceActive()) { + return; + } + this.attackTarget = target; + this.currentAttack = attackType; + this.attackAnimTicks = attackType.animTicks(); + this.attackDamageApplied = false; + this.getNavigation().stop(); + if (attackType == AttackType.CLAW) { + this.clawCooldownTicks = AntarchySettings.emperorScorpionClawCooldownTicks(); + this.level().broadcastEntityEvent(this, CLAW_ATTACK_EVENT); + this.commitLunge(target, CLAW_LUNGE_SPEED, CLAW_LUNGE_LIFT); + } else if (attackType == AttackType.STING) { + this.stingCooldownTicks = AntarchySettings.emperorScorpionStingCooldownTicks(); + this.level().broadcastEntityEvent(this, STING_ATTACK_EVENT); + this.commitLunge(target, STING_LUNGE_SPEED, STING_LUNGE_LIFT); + } + } + + private void tickActiveAttack() { + if (this.attackTarget == null || !this.attackTarget.isAlive() || this.isHardenSequenceActive()) { + this.resetAttackState(); + return; + } + + this.getLookControl().setLookAt(this.attackTarget, 30.0F, 30.0F); + if (!this.attackDamageApplied + && this.attackAnimTicks == this.currentAttack.hitTick() + && this.canHitAttackTarget(this.attackTarget, this.currentAttack)) { + this.attackDamageApplied = true; + if (this.currentAttack == AttackType.STING) { + this.doStingAttack(this.attackTarget); } else { - this.stingAttackActive = false; - this.attackAnimTicks = SNAP_ATTACK_ANIM_TICKS; - this.attackDamageApplied = false; - this.level().broadcastEntityEvent(this, SNAP_ATTACK_ANIM_EVENT); - } - if (!usedSting) { - this.playSound(AntarchySoundEvents.EMPEROR_SCORPION_ATTACK.get(), 0.9F, 0.95F + this.random.nextFloat() * 0.08F); + this.doHurtTarget(this.attackTarget); } } - return hurt; } - private boolean performStingAttack(Entity target) { - if (!(target instanceof LivingEntity living)) { - return false; + private boolean canHitAttackTarget(LivingEntity target, AttackType attackType) { + double range = attackType == AttackType.STING ? STING_RANGE : CLAW_RANGE; + return this.distanceToSqr(target) <= range * range && this.hasLineOfSight(target); + } + + private void resetAttackState() { + this.attackAnimTicks = 0; + this.attackDamageApplied = false; + this.currentAttack = AttackType.NONE; + this.attackTarget = null; + } + + private void tickHardenState() { + if (this.getHardenPhase() == HardenPhase.NONE) { + if (this.hardenCooldownTicks <= 0 && this.getTarget() != null && this.getTarget().isAlive()) { + this.beginHardenCast(); + } + return; } + + this.getNavigation().stop(); + this.setSpeed(0.0F); + this.setZza(0.0F); + + switch (this.getHardenPhase()) { + case CASTING -> { + if (this.hardenCastTicks % this.hardenCastSpawnTicks == 0 + && this.hardenSummonedScorpions < AntarchySettings.emperorScorpionMaxSummonedScorpions()) { + this.summonScorpionMinion(); + this.hardenSummonedScorpions++; + if (this.hardenSummonedScorpions >= AntarchySettings.emperorScorpionMaxSummonedScorpions()) { + this.beginHardening(); + return; + } + } + if (--this.hardenCastTicks <= 0) { + this.beginHardening(); + } + } + case START -> { + this.lockHardenRotation(); + if (--this.hardenStateTicks <= 0) { + this.beginHardened(); + } + } + case ACTIVE -> { + this.lockHardenRotation(); + Vec3 motion = this.getDeltaMovement(); + this.setDeltaMovement(0.0D, motion.y, 0.0D); + if (--this.hardenDurationTicks <= 0) { + this.beginHardeningEnd(); + return; + } + if (--this.hardenHealTicks <= 0) { + this.hardenHealTicks = HARDEN_HEAL_INTERVAL_TICKS; + this.heal(HARDEN_HEAL_AMOUNT); + } + } + case END -> { + this.lockHardenRotation(); + Vec3 motion = this.getDeltaMovement(); + this.setDeltaMovement(0.0D, motion.y, 0.0D); + if (--this.hardenStateTicks <= 0) { + this.setHardenPhase(HardenPhase.NONE); + this.hardenCooldownTicks = Math.max(1, AntarchySettings.emperorScorpionSummonIntervalTicks()); + } + } + } + } + + private void beginHardenCast() { + this.setHardenPhase(HardenPhase.CASTING); + this.hardenCastTicks = Math.max(1, AntarchySettings.emperorScorpionSummonIntervalTicks()); + this.hardenCastSpawnTicks = Math.max(1, this.hardenCastTicks / Math.max(1, AntarchySettings.emperorScorpionMaxSummonedScorpions())); + this.hardenStateTicks = 0; + this.hardenDurationTicks = 0; + this.hardenHealTicks = 0; + this.hardenSummonedScorpions = 0; + this.resetAttackState(); + this.getNavigation().stop(); + } + + private void beginHardening() { + this.setHardenPhase(HardenPhase.START); + this.hardenStateTicks = HARDEN_START_TICKS; + this.hardenLockedYaw = this.getYRot(); + this.hardenLockedPitch = this.getXRot(); + this.playSound(AntarchySoundEvents.EMPEROR_SCORPION_ROAR.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.05F); + this.setAggressive(false); + } + + private void beginHardened() { + this.setHardenPhase(HardenPhase.ACTIVE); + this.hardenDurationTicks = HARDEN_MIN_DURATION_TICKS + this.random.nextInt(HARDEN_MAX_DURATION_TICKS - HARDEN_MIN_DURATION_TICKS + 1); + this.hardenHealTicks = HARDEN_HEAL_INTERVAL_TICKS; + } + + private void beginHardeningEnd() { + this.setHardenPhase(HardenPhase.END); + this.hardenStateTicks = HARDEN_END_TICKS; + this.setAggressive(false); + } + + private void summonScorpionMinion() { if (!(this.level() instanceof ServerLevel serverLevel)) { - return false; + return; } - boolean hurt = living.hurt(AntarchyDamageSources.emperorScorpionSting(serverLevel, this), STING_DAMAGE); - if (hurt) { - int poisonDuration = this.level().getDifficulty() == Difficulty.HARD - ? POISON_DURATION_TICKS * 2 : POISON_DURATION_TICKS; - living.addEffect(new MobEffectInstance(MobEffects.POISON, poisonDuration, 1)); - living.addEffect(new MobEffectInstance(MobEffects.WEAKNESS, WEAKNESS_DURATION_TICKS, 0)); - this.playSound(AntarchySoundEvents.EMPEROR_SCORPION_ATTACK.get(), 1.0F, 0.9F + this.random.nextFloat() * 0.08F); + + ScorpionEntity scorpion = AntarchyObjects.SCORPION.get().create(serverLevel); + if (scorpion == null) { + return; } - return hurt; + + Vec3 ring = Vec3.directionFromRotation(0.0F, this.random.nextFloat() * 360.0F) + .scale(2.75D + this.random.nextDouble() * 1.75D); + BlockPos spawnPos = BlockPos.containing(this.getX() + ring.x, this.getY(), this.getZ() + ring.z); + scorpion.moveTo(spawnPos.getX() + 0.5D, spawnPos.getY(), spawnPos.getZ() + 0.5D, this.random.nextFloat() * 360.0F, 0.0F); + scorpion.finalizeSpawn(serverLevel, serverLevel.getCurrentDifficultyAt(spawnPos), MobSpawnType.MOB_SUMMONED, null); + scorpion.setPersistenceRequired(); + if (this.getTarget() instanceof LivingEntity target) { + scorpion.setTarget(target); + } + serverLevel.addFreshEntity(scorpion); } - private boolean shouldUseSting(LivingEntity target) { - return this.stingCooldownTicks <= 0 - && target.isAlive() - && (this.getHealth() <= this.getMaxHealth() * 0.8F || this.random.nextFloat() < 0.35F); - } - - private boolean isAttackLocked() { - return this.attackAnimTicks > 0 || this.agroAnimTicks > 0; - } - - private boolean isInCombat() { - return this.getTarget() != null || this.isAttackLocked(); + private void commitLunge(LivingEntity target, double horizontalSpeed, double verticalSpeed) { + Vec3 lunge = target.position().subtract(this.position()); + Vec3 horizontal = new Vec3(lunge.x, 0.0D, lunge.z); + if (horizontal.lengthSqr() < 1.0E-4D) { + return; + } + horizontal = horizontal.normalize().scale(horizontalSpeed); + this.setDeltaMovement(this.getDeltaMovement().add(horizontal.x, verticalSpeed, horizontal.z)); + this.hasImpulse = true; } @Override public void handleEntityEvent(byte id) { - if (id == SNAP_ATTACK_ANIM_EVENT) { - this.attackAnimTicks = SNAP_ATTACK_ANIM_TICKS; + if (id == CLAW_ATTACK_EVENT) { + this.currentAttack = AttackType.CLAW; + this.attackAnimTicks = AntarchySettings.emperorScorpionClawAnimTicks(); this.attackDamageApplied = false; - this.stingAttackActive = false; return; } - if (id == STING_ATTACK_ANIM_EVENT) { - this.attackAnimTicks = STING_ATTACK_ANIM_TICKS; + if (id == STING_ATTACK_EVENT) { + this.currentAttack = AttackType.STING; + this.attackAnimTicks = AntarchySettings.emperorScorpionStingAnimTicks(); this.attackDamageApplied = false; - this.stingAttackActive = true; - return; - } - if (id == AGRO_ANIM_EVENT) { - this.agroAnimTicks = AGRO_ANIM_TICKS; return; } super.handleEntityEvent(id); @@ -341,19 +463,85 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity { } private PlayState mainController(AnimationState state) { + return switch (this.getAnimationState()) { + case ANIM_WALK -> state.setAndContinue(WALK_ANIM); + case ANIM_CLAW_ATTACK -> state.setAndContinue(CLAW_ATTACK_ANIM); + case ANIM_STING_ATTACK -> state.setAndContinue(STING_ATTACK_ANIM); + case ANIM_HARDEN_START -> state.setAndContinue(HARDEN_START_ANIM); + case ANIM_HARDEN_ACTIVE -> state.setAndContinue(HARDEN_ACTIVE_ANIM); + case ANIM_HARDEN_END -> state.setAndContinue(HARDEN_END_ANIM); + case ANIM_DEATH -> state.setAndContinue(DEATH_ANIM); + default -> state.setAndContinue(IDLE_ANIM); + }; + } + + private int getAnimationState() { + return this.entityData.get(ANIMATION_STATE); + } + + private HardenPhase getHardenPhase() { + HardenPhase[] phases = HardenPhase.values(); + int phaseOrdinal = this.entityData.get(HARDEN_PHASE); + return phaseOrdinal >= 0 && phaseOrdinal < phases.length ? phases[phaseOrdinal] : HardenPhase.NONE; + } + + public int getHardenPhaseIndex() { + return this.entityData.get(HARDEN_PHASE); + } + + private void setAnimationState(int animationState) { + this.entityData.set(ANIMATION_STATE, animationState); + } + + private void setHardenPhase(HardenPhase phase) { + this.hardenPhase = phase; + this.entityData.set(HARDEN_PHASE, phase.ordinal()); + } + + private void lockHardenRotation() { + if (!this.isHardenSequenceActive()) { + return; + } + this.setYRot(this.hardenLockedYaw); + this.setYHeadRot(this.hardenLockedYaw); + this.yBodyRot = this.hardenLockedYaw; + this.yBodyRotO = this.hardenLockedYaw; + this.yHeadRotO = this.hardenLockedYaw; + this.setXRot(this.hardenLockedPitch); + this.xRotO = this.hardenLockedPitch; + } + + private void updateAnimationState() { if (this.isDeadOrDying()) { - return state.setAndContinue(DEATH_ANIM); + this.setAnimationState(ANIM_DEATH); + return; + } + HardenPhase currentHardenPhase = this.getHardenPhase(); + if (currentHardenPhase == HardenPhase.START) { + this.setAnimationState(ANIM_HARDEN_START); + return; + } + if (currentHardenPhase == HardenPhase.ACTIVE) { + this.setAnimationState(ANIM_HARDEN_ACTIVE); + return; + } + if (currentHardenPhase == HardenPhase.END) { + this.setAnimationState(ANIM_HARDEN_END); + return; } if (this.attackAnimTicks > 0) { - return state.setAndContinue(this.stingAttackActive ? STING_ANIM : SNAP_ANIM); + this.setAnimationState(this.currentAttack == AttackType.STING ? ANIM_STING_ATTACK : ANIM_CLAW_ATTACK); + return; } - if (this.agroAnimTicks > 0) { - return state.setAndContinue(AGRO_ANIM); + if (currentHardenPhase == HardenPhase.CASTING) { + this.setAnimationState(ANIM_IDLE); + return; } - if (state.isMoving()) { - return state.setAndContinue(WALK_ANIM); + if (this.getTarget() != null || this.getDeltaMovement().horizontalDistanceSqr() > 1.0E-4D) { + this.setAnimationState(ANIM_WALK); + return; } - return state.setAndContinue(IDLE_ANIM); + this.setAnimationState(ANIM_IDLE); } @Override @@ -390,6 +578,50 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity { return 0.8F; } + @Override + public void addAdditionalSaveData(CompoundTag tag) { + super.addAdditionalSaveData(tag); + tag.putInt("HardenPhase", this.hardenPhase.ordinal()); + tag.putInt("HardenCooldownTicks", this.hardenCooldownTicks); + tag.putInt("HardenCastTicks", this.hardenCastTicks); + tag.putInt("HardenCastSpawnTicks", this.hardenCastSpawnTicks); + tag.putInt("HardenStateTicks", this.hardenStateTicks); + tag.putInt("HardenDurationTicks", this.hardenDurationTicks); + tag.putInt("HardenHealTicks", this.hardenHealTicks); + tag.putInt("HardenSummonedScorpions", this.hardenSummonedScorpions); + } + + @Override + public void readAdditionalSaveData(CompoundTag tag) { + super.readAdditionalSaveData(tag); + if (tag.contains("HardenPhase")) { + int phaseOrdinal = tag.getInt("HardenPhase"); + HardenPhase[] phases = HardenPhase.values(); + this.setHardenPhase(phaseOrdinal >= 0 && phaseOrdinal < phases.length ? phases[phaseOrdinal] : HardenPhase.NONE); + } + if (tag.contains("HardenCooldownTicks")) { + this.hardenCooldownTicks = tag.getInt("HardenCooldownTicks"); + } + if (tag.contains("HardenCastTicks")) { + this.hardenCastTicks = tag.getInt("HardenCastTicks"); + } + if (tag.contains("HardenCastSpawnTicks")) { + this.hardenCastSpawnTicks = tag.getInt("HardenCastSpawnTicks"); + } + if (tag.contains("HardenStateTicks")) { + this.hardenStateTicks = tag.getInt("HardenStateTicks"); + } + if (tag.contains("HardenDurationTicks")) { + this.hardenDurationTicks = tag.getInt("HardenDurationTicks"); + } + if (tag.contains("HardenHealTicks")) { + this.hardenHealTicks = tag.getInt("HardenHealTicks"); + } + if (tag.contains("HardenSummonedScorpions")) { + this.hardenSummonedScorpions = tag.getInt("HardenSummonedScorpions"); + } + } + @Override public void setCustomName(@Nullable net.minecraft.network.chat.Component name) { super.setCustomName(name); @@ -413,4 +645,158 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity { super.remove(reason); this.bossEvent.removeAllPlayers(); } + + private boolean isAttackLocked() { + return this.attackAnimTicks > 0; + } + + public boolean isHardenSequenceActive() { + return this.getHardenPhase() != HardenPhase.NONE; + } + + public boolean isHardenedStateActive() { + HardenPhase currentHardenPhase = this.getHardenPhase(); + return currentHardenPhase == HardenPhase.START + || currentHardenPhase == HardenPhase.ACTIVE + || currentHardenPhase == HardenPhase.END; + } + + public boolean isHardened() { + return this.getHardenPhase() == HardenPhase.ACTIVE; + } + + public boolean shouldUseHardenTexture() { + return this.getHardenPhase() == HardenPhase.START + || this.getHardenPhase() == HardenPhase.ACTIVE + || this.getHardenPhase() == HardenPhase.END; + } + + private final class EmperorScorpionCombatGoal extends Goal { + private static final double CHASE_SPEED = 1.1D; + + private EmperorScorpionCombatGoal() { + this.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK)); + } + + @Override + public boolean canUse() { + LivingEntity target = EmperorScorpionEntity.this.getTarget(); + return target != null && target.isAlive() && !EmperorScorpionEntity.this.isHardenSequenceActive(); + } + + @Override + public boolean canContinueToUse() { + LivingEntity target = EmperorScorpionEntity.this.getTarget(); + return (target != null && target.isAlive()) || EmperorScorpionEntity.this.isAttackLocked(); + } + + @Override + public void start() { + EmperorScorpionEntity.this.setAggressive(true); + } + + @Override + public void stop() { + EmperorScorpionEntity.this.setAggressive(false); + EmperorScorpionEntity.this.getNavigation().stop(); + } + + @Override + public void tick() { + LivingEntity target = EmperorScorpionEntity.this.getTarget(); + if (target == null) { + EmperorScorpionEntity.this.getNavigation().stop(); + return; + } + + if (EmperorScorpionEntity.this.isHardenSequenceActive()) { + this.stopMovement(); + return; + } + + EmperorScorpionEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F); + + if (EmperorScorpionEntity.this.isAttackLocked()) { + this.stopMovement(); + return; + } + + if (!EmperorScorpionEntity.this.hasLineOfSight(target)) { + EmperorScorpionEntity.this.getNavigation().moveTo(target, CHASE_SPEED); + return; + } + + if (!EmperorScorpionEntity.this.isWithinMeleeAttackRange(target)) { + EmperorScorpionEntity.this.getNavigation().moveTo(target, CHASE_SPEED); + return; + } + + this.stopMovement(); + AttackType attackType = EmperorScorpionEntity.this.selectAttack(target); + if (attackType == AttackType.NONE) { + EmperorScorpionEntity.this.getNavigation().moveTo(target, CHASE_SPEED); + return; + } + + EmperorScorpionEntity.this.beginAttack(target, attackType); + } + + private void stopMovement() { + EmperorScorpionEntity.this.getNavigation().stop(); + EmperorScorpionEntity.this.setSpeed(0.0F); + EmperorScorpionEntity.this.setZza(0.0F); + } + } + + @Override + public boolean isWithinMeleeAttackRange(LivingEntity target) { + return this.distanceToSqr(target) <= STING_RANGE * STING_RANGE; + } + + private AttackType selectAttack(LivingEntity target) { + boolean inClawRange = this.clawCooldownTicks <= 0 && this.distanceToSqr(target) <= CLAW_RANGE * CLAW_RANGE; + boolean inStingRange = this.stingCooldownTicks <= 0 && this.distanceToSqr(target) <= STING_RANGE * STING_RANGE; + boolean canClaw = inClawRange && this.hasLineOfSight(target); + boolean canSting = inStingRange && this.hasLineOfSight(target); + if (canSting && (!canClaw || this.random.nextFloat() < 0.3F)) { + return AttackType.STING; + } + if (canClaw) { + return AttackType.CLAW; + } + if (canSting) { + return AttackType.STING; + } + return AttackType.NONE; + } + + private enum AttackType { + NONE, + CLAW, + STING; + + private int animTicks() { + return switch (this) { + case CLAW -> AntarchySettings.emperorScorpionClawAnimTicks(); + case STING -> AntarchySettings.emperorScorpionStingAnimTicks(); + default -> 0; + }; + } + + private int hitTick() { + return switch (this) { + case CLAW -> AntarchySettings.emperorScorpionClawHitTick(); + case STING -> AntarchySettings.emperorScorpionStingHitTick(); + default -> 0; + }; + } + } + + private enum HardenPhase { + NONE, + CASTING, + START, + ACTIVE, + END + } } diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/GlimmerEntity.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/GlimmerEntity.java new file mode 100644 index 00000000..79732784 --- /dev/null +++ b/common/src/main/java/com/craisinlord/antarchy/content/entity/GlimmerEntity.java @@ -0,0 +1,430 @@ +package com.craisinlord.antarchy.content.entity; + +import com.craisinlord.antarchy.config.AntarchySettings; +import com.craisinlord.antarchy.content.AntarchyObjects; +import com.craisinlord.antarchy.content.AntarchyTags; +import com.craisinlord.antarchy.content.GlimmerParticles; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.DifficultyInstance; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.AgeableMob; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobSpawnType; +import net.minecraft.world.entity.SpawnGroupData; +import net.minecraft.world.entity.ai.attributes.AttributeSupplier; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.entity.ai.goal.FloatGoal; +import net.minecraft.world.entity.ai.goal.FollowParentGoal; +import net.minecraft.world.entity.ai.goal.Goal; +import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal; +import net.minecraft.world.entity.ai.goal.PanicGoal; +import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal; +import net.minecraft.world.entity.ai.goal.TemptGoal; +import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal; +import net.minecraft.world.entity.ai.util.DefaultRandomPos; +import net.minecraft.world.entity.animal.Animal; +import net.minecraft.world.entity.monster.Monster; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.util.Mth; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.ServerLevelAccessor; +import net.minecraft.world.level.pathfinder.Path; +import net.minecraft.world.phys.Vec3; +import net.minecraft.server.level.ServerLevel; +import org.jetbrains.annotations.Nullable; +import software.bernie.geckolib.animatable.GeoEntity; +import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache; +import software.bernie.geckolib.animation.AnimatableManager; +import software.bernie.geckolib.animation.AnimationController; +import software.bernie.geckolib.animation.AnimationState; +import software.bernie.geckolib.animation.PlayState; +import software.bernie.geckolib.animation.RawAnimation; +import software.bernie.geckolib.util.GeckoLibUtil; + +public class GlimmerEntity extends Animal implements GeoEntity { + private static final EntityDataAccessor GLOW_TICKS = + SynchedEntityData.defineId(GlimmerEntity.class, EntityDataSerializers.INT); + private static final RawAnimation IDLE_ANIM = RawAnimation.begin().thenLoop("idle"); + private static final RawAnimation WALK_ANIM = RawAnimation.begin().thenLoop("walk"); + private static final RawAnimation RUN_ANIM = RawAnimation.begin().thenLoop("run"); + private static final String QUIRK_CONTROLLER = "quirk_controller"; + private static final String QUIRK_TRIGGER = "quirk"; + + private static final int TRUST_REQUIRED_FEEDS = 3; + private static final int GRACE_DURATION_TICKS = 2400; + private static final int GRACE_COOLDOWN_TICKS = 6000; + private static final int GLOW_LIGHT_THRESHOLD = 7; + private static final int GLOW_CHECK_INTERVAL_TICKS = 20; + private static final int GLOW_TRANSITION_TICKS = 10; + private static final double WALK_SPEED_THRESHOLD_SQR = 0.0009D; + private static final double RUN_SPEED_THRESHOLD_SQR = 0.0035D; + + private static final int MIN_QUIRK_COOLDOWN = 20 * 8; + private static final int MAX_QUIRK_COOLDOWN = 20 * 25; + + private static final String TRUST_KEY = "GlimmerTrust"; + private static final String TRUST_PLAYER_KEY = "Player"; + private static final String TRUST_FEED_COUNT_KEY = "FeedCount"; + private static final String TRUST_TRUSTED_KEY = "Trusted"; + private static final String TRUST_COOLDOWN_KEY = "GraceCooldown"; + private static final String GLOWING_SAVE_KEY = "Glowing"; + + private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); + private final Map trustByPlayer = new HashMap<>(); + + private boolean glowing; + private int quirkCooldown = createQuirkCooldown(); + + public GlimmerEntity(EntityType entityType, Level level) { + super(entityType, level); + } + + public static AttributeSupplier.Builder createAttributes() { + return net.minecraft.world.entity.Mob.createMobAttributes() + .add(Attributes.MAX_HEALTH, AntarchySettings.glimmerHealth()) + .add(Attributes.MOVEMENT_SPEED, 0.3D) + .add(Attributes.FOLLOW_RANGE, 24.0D); + } + + @Override + protected void defineSynchedData(SynchedEntityData.Builder builder) { + super.defineSynchedData(builder); + builder.define(GLOW_TICKS, 0); + } + + @Override + protected void registerGoals() { + this.goalSelector.addGoal(0, new FloatGoal(this)); + this.goalSelector.addGoal(1, new PanicGoal(this, 1.6D)); + this.goalSelector.addGoal(2, new TemptGoal(this, 1.1D, Ingredient.of(AntarchyTags.Items.GLIMMER_FOOD), false)); + this.goalSelector.addGoal(3, new AvoidUntrustedPlayerGoal(10.0F, 1.15D)); + this.goalSelector.addGoal(4, new net.minecraft.world.entity.ai.goal.AvoidEntityGoal<>(this, Monster.class, 8.0F, 1.0D, 1.2D)); + this.goalSelector.addGoal(5, new FollowParentGoal(this, 1.25D)); + this.goalSelector.addGoal(6, new WaterAvoidingRandomStrollGoal(this, 1.0D)); + this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 8.0F)); + this.goalSelector.addGoal(8, new RandomLookAroundGoal(this)); + } + + @Override + public boolean isFood(ItemStack stack) { + return stack.is(AntarchyTags.Items.GLIMMER_FOOD); + } + + @Override + public GlimmerEntity getBreedOffspring(ServerLevel level, AgeableMob otherParent) { + return null; + } + + @Override + public InteractionResult mobInteract(Player player, InteractionHand hand) { + ItemStack stack = player.getItemInHand(hand); + if (stack.is(AntarchyTags.Items.GLIMMER_FOOD)) { + return this.feedGlimmerFood(player, stack, hand); + } + return super.mobInteract(player, hand); + } + + private InteractionResult feedGlimmerFood(Player player, ItemStack stack, InteractionHand hand) { + if (this.level().isClientSide) { + return InteractionResult.CONSUME; + } + + this.usePlayerItem(player, hand, stack); + this.playSound(SoundEvents.GENERIC_EAT, 1.0F, 1.0F + (this.random.nextFloat() - 0.5F) * 0.2F); + + if (!this.isBaby()) { + TrustEntry entry = this.trustByPlayer.computeIfAbsent(player.getUUID(), id -> new TrustEntry()); + if (!entry.trusted) { + entry.feedCount++; + if (entry.feedCount >= TRUST_REQUIRED_FEEDS) { + entry.trusted = true; + } + } else if (this.glowing && entry.graceCooldown <= 0) { + player.addEffect(new MobEffectInstance(AntarchyObjects.GLIMMERS_GRACE.get(), GRACE_DURATION_TICKS, 0, false, true, true)); + entry.graceCooldown = GRACE_COOLDOWN_TICKS; + } + } + + return InteractionResult.SUCCESS; + } + + public boolean isTrusted(UUID playerId) { + TrustEntry entry = this.trustByPlayer.get(playerId); + return entry != null && entry.trusted; + } + + private boolean hasAnyTrustProgress() { + for (TrustEntry entry : this.trustByPlayer.values()) { + if (entry.trusted || entry.feedCount > 0) { + return true; + } + } + return false; + } + + @Override + public boolean isPersistenceRequired() { + return super.isPersistenceRequired() || (!this.isBaby() && this.hasAnyTrustProgress()); + } + + public boolean isGlowingState() { + return this.getGlowTicks() > 0; + } + + public float getGlowBlend(float partialTick) { + return Mth.clamp((this.getGlowTicks() + partialTick) / (float) GLOW_TRANSITION_TICKS, 0.0F, 1.0F); + } + + @Override + public void tick() { + super.tick(); + + if (this.quirkCooldown > 0) { + this.quirkCooldown--; + } + + if (!this.level().isClientSide && this.tickCount % GLOW_CHECK_INTERVAL_TICKS == 0) { + this.glowing = this.level().getMaxLocalRawBrightness(this.blockPosition()) <= GLOW_LIGHT_THRESHOLD; + } + + if (!this.level().isClientSide) { + int glowTicks = this.getGlowTicks(); + if (this.glowing && glowTicks < GLOW_TRANSITION_TICKS) { + this.setGlowTicks(glowTicks + 1); + } else if (!this.glowing && glowTicks > 0) { + this.setGlowTicks(glowTicks - 1); + } + } + + if (this.isGlowingState()) { + GlimmerParticles.tickAmbient(this, this.getDeltaMovement().horizontalDistanceSqr() > RUN_SPEED_THRESHOLD_SQR); + } + + if (this.level().isClientSide) { + return; + } + + for (TrustEntry entry : this.trustByPlayer.values()) { + if (entry.graceCooldown > 0) { + entry.graceCooldown--; + } + } + } + + @Override + public void addAdditionalSaveData(CompoundTag tag) { + super.addAdditionalSaveData(tag); + tag.putBoolean(GLOWING_SAVE_KEY, this.glowing); + + ListTag trustList = new ListTag(); + for (Map.Entry entry : this.trustByPlayer.entrySet()) { + CompoundTag entryTag = new CompoundTag(); + entryTag.putUUID(TRUST_PLAYER_KEY, entry.getKey()); + entryTag.putInt(TRUST_FEED_COUNT_KEY, entry.getValue().feedCount); + entryTag.putBoolean(TRUST_TRUSTED_KEY, entry.getValue().trusted); + entryTag.putInt(TRUST_COOLDOWN_KEY, entry.getValue().graceCooldown); + trustList.add(entryTag); + } + tag.put(TRUST_KEY, trustList); + } + + @Override + public void readAdditionalSaveData(CompoundTag tag) { + super.readAdditionalSaveData(tag); + this.glowing = tag.getBoolean(GLOWING_SAVE_KEY); + this.setGlowTicks(this.glowing ? GLOW_TRANSITION_TICKS : 0); + + this.trustByPlayer.clear(); + for (net.minecraft.nbt.Tag rawEntry : tag.getList(TRUST_KEY, net.minecraft.nbt.Tag.TAG_COMPOUND)) { + CompoundTag entryTag = (CompoundTag) rawEntry; + TrustEntry entry = new TrustEntry(); + entry.feedCount = entryTag.getInt(TRUST_FEED_COUNT_KEY); + entry.trusted = entryTag.getBoolean(TRUST_TRUSTED_KEY); + entry.graceCooldown = entryTag.getInt(TRUST_COOLDOWN_KEY); + this.trustByPlayer.put(entryTag.getUUID(TRUST_PLAYER_KEY), entry); + } + } + + @Override + @Nullable + public SpawnGroupData finalizeSpawn(ServerLevelAccessor level, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData spawnGroupData) { + GlimmerSpawnData glimmerSpawnData = spawnGroupData instanceof GlimmerSpawnData data ? data : new GlimmerSpawnData(); + SpawnGroupData result = super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData); + + if ((spawnReason == MobSpawnType.NATURAL || spawnReason == MobSpawnType.CHUNK_GENERATION)) { + if (glimmerSpawnData.adultSpawned) { + this.setAge(-24000); + } else { + glimmerSpawnData.adultSpawned = true; + } + } + + return result != null ? result : glimmerSpawnData; + } + + @Override + public net.minecraft.world.entity.EntityDimensions getDefaultDimensions(net.minecraft.world.entity.Pose pose) { + net.minecraft.world.entity.EntityDimensions dimensions = super.getDefaultDimensions(pose); + if (this.isBaby()) { + return dimensions; + } + return net.minecraft.world.entity.EntityDimensions.scalable(dimensions.width() * 2.0F, dimensions.height() * 2.0F); + } + + @Override + protected void ageBoundaryReached() { + super.ageBoundaryReached(); + this.refreshDimensions(); + } + + @Override + protected SoundEvent getAmbientSound() { + return SoundEvents.FOX_AMBIENT; + } + + @Override + protected SoundEvent getHurtSound(DamageSource damageSource) { + return SoundEvents.FOX_HURT; + } + + @Override + protected SoundEvent getDeathSound() { + return SoundEvents.FOX_DEATH; + } + + @Override + protected float getSoundVolume() { + return 0.8F; + } + + @Override + public void registerControllers(AnimatableManager.ControllerRegistrar controllers) { + controllers.add(new AnimationController<>(this, "main_controller", 0, this::mainAnimController)); + controllers.add(new AnimationController<>(this, QUIRK_CONTROLLER, 0, state -> PlayState.STOP) + .triggerableAnim(QUIRK_TRIGGER, RawAnimation.begin().thenPlay("quirk"))); + } + + private PlayState mainAnimController(AnimationState state) { + double speedSqr = this.getDeltaMovement().horizontalDistanceSqr(); + if (speedSqr > RUN_SPEED_THRESHOLD_SQR) { + return state.setAndContinue(RUN_ANIM); + } + if (speedSqr > WALK_SPEED_THRESHOLD_SQR) { + return state.setAndContinue(WALK_ANIM); + } + + if (this.quirkCooldown <= 0) { + this.quirkCooldown = this.createQuirkCooldown(); + this.triggerAnim(QUIRK_CONTROLLER, QUIRK_TRIGGER); + } + + return state.setAndContinue(IDLE_ANIM); + } + + private int createQuirkCooldown() { + return MIN_QUIRK_COOLDOWN + this.random.nextInt(MAX_QUIRK_COOLDOWN - MIN_QUIRK_COOLDOWN + 1); + } + + @Override + public AnimatableInstanceCache getAnimatableInstanceCache() { + return this.geoCache; + } + + private int getGlowTicks() { + return this.entityData.get(GLOW_TICKS); + } + + private void setGlowTicks(int glowTicks) { + this.entityData.set(GLOW_TICKS, Mth.clamp(glowTicks, 0, GLOW_TRANSITION_TICKS)); + } + + private static final class TrustEntry { + int feedCount; + boolean trusted; + int graceCooldown; + } + + private static final class GlimmerSpawnData implements SpawnGroupData { + private boolean adultSpawned; + } + + private final class AvoidUntrustedPlayerGoal extends Goal { + private final float maxDistance; + private final double speedModifier; + private Player avoidTarget; + private Path path; + + AvoidUntrustedPlayerGoal(float maxDistance, double speedModifier) { + this.maxDistance = maxDistance; + this.speedModifier = speedModifier; + this.setFlags(EnumSet.of(Flag.MOVE)); + } + + @Override + public boolean canUse() { + if (GlimmerEntity.this.isBaby()) { + return false; + } + + Player nearest = GlimmerEntity.this.level().getNearestPlayer(GlimmerEntity.this, this.maxDistance); + if (nearest == null || nearest.isSpectator() || nearest.isCreative() + || GlimmerEntity.this.isTrusted(nearest.getUUID()) + || GlimmerEntity.this.distanceToSqr(nearest) > (double) (this.maxDistance * this.maxDistance)) { + return false; + } + + Path escapePath = this.findEscapePath(nearest); + if (escapePath == null) { + return false; + } + + this.avoidTarget = nearest; + this.path = escapePath; + return true; + } + + @Override + public boolean canContinueToUse() { + return this.avoidTarget != null + && this.avoidTarget.isAlive() + && !GlimmerEntity.this.isTrusted(this.avoidTarget.getUUID()) + && !GlimmerEntity.this.getNavigation().isDone(); + } + + @Override + public void start() { + GlimmerEntity.this.getNavigation().moveTo(this.path, this.speedModifier); + } + + @Override + public void stop() { + this.avoidTarget = null; + this.path = null; + } + + @Nullable + private Path findEscapePath(Player toAvoid) { + Vec3 escapeVec = DefaultRandomPos.getPosAway(GlimmerEntity.this, 16, 7, toAvoid.position()); + if (escapeVec == null) { + return null; + } + return GlimmerEntity.this.getNavigation().createPath(BlockPos.containing(escapeVec), 0); + } + } +} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/SpitBugEntity.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/SpitBugEntity.java deleted file mode 100644 index 8acee363..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/entity/SpitBugEntity.java +++ /dev/null @@ -1,265 +0,0 @@ -package com.craisinlord.antarchy.content.entity; - -import com.craisinlord.antarchy.Antarchy; -import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.util.RandomSource; -import net.minecraft.world.Difficulty; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.Mob; -import net.minecraft.world.entity.MobSpawnType; -import net.minecraft.world.entity.ai.attributes.AttributeSupplier; -import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.goal.FloatGoal; -import net.minecraft.world.entity.ai.goal.Goal; -import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal; -import net.minecraft.world.entity.ai.goal.MeleeAttackGoal; -import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal; -import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal; -import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal; -import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal; -import net.minecraft.world.entity.monster.Monster; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.phys.Vec3; -import software.bernie.geckolib.animatable.GeoEntity; -import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache; -import software.bernie.geckolib.animation.AnimatableManager; -import software.bernie.geckolib.animation.AnimationController; -import software.bernie.geckolib.animation.AnimationState; -import software.bernie.geckolib.animation.PlayState; -import software.bernie.geckolib.animation.RawAnimation; -import software.bernie.geckolib.util.GeckoLibUtil; - -import java.util.EnumSet; - -public class SpitBugEntity extends Monster implements GeoEntity { - private static final EntityDataAccessor SPIT_ANIM_TICKS = - SynchedEntityData.defineId(SpitBugEntity.class, EntityDataSerializers.INT); - private static final RawAnimation IDLE_ANIM = RawAnimation.begin().thenLoop("idle"); - private static final RawAnimation WALK_ANIM = RawAnimation.begin().thenLoop("walk"); - private static final RawAnimation SPIT_ANIM = RawAnimation.begin().thenPlay("spit"); - - private static final double MAX_HEALTH = 50.0D; - private static final double MOVEMENT_SPEED = 0.23D; - private static final double ATTACK_DAMAGE = 5.0D; - private static final double FOLLOW_RANGE = 24.0D; - private static final double SPIT_RANGE_SQR = 14.0D * 14.0D; - private static final double MELEE_RANGE_SQR = 3.5D * 3.5D; - private static final int SPIT_COOLDOWN_TICKS = 55; - private static final int SPIT_ANIMATION_TICKS = 18; - private static final int SPIT_RELEASE_TICKS = 8; - - private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); - - private int spitCooldownTicks; - private int spitAnimationTicks; - private int spitReleaseTicks; - - public SpitBugEntity(EntityType entityType, Level level) { - super(entityType, level); - this.xpReward = 10; - } - - public static AttributeSupplier.Builder createAttributes() { - return Mob.createMobAttributes() - .add(Attributes.MAX_HEALTH, MAX_HEALTH) - .add(Attributes.MOVEMENT_SPEED, MOVEMENT_SPEED) - .add(Attributes.ATTACK_DAMAGE, ATTACK_DAMAGE) - .add(Attributes.FOLLOW_RANGE, FOLLOW_RANGE) - .add(Attributes.ARMOR, 4.0D) - .add(Attributes.KNOCKBACK_RESISTANCE, 0.2D); - } - - public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { - if (spawnReason == MobSpawnType.SPAWN_EGG || spawnReason == MobSpawnType.SPAWNER || spawnReason == MobSpawnType.COMMAND) { - return true; - } - - return level.getDifficulty() != Difficulty.PEACEFUL - && level.isEmptyBlock(pos) - && level.isEmptyBlock(pos.above()) - && Monster.checkMonsterSpawnRules(entityType, level, spawnReason, pos, random); - } - - @Override - protected void defineSynchedData(SynchedEntityData.Builder builder) { - super.defineSynchedData(builder); - builder.define(SPIT_ANIM_TICKS, 0); - } - - @Override - protected void registerGoals() { - this.goalSelector.addGoal(0, new FloatGoal(this)); - this.goalSelector.addGoal(1, new SpitAttackGoal()); - this.goalSelector.addGoal(2, new MeleeAttackGoal(this, 1.0D, false)); - this.goalSelector.addGoal(3, new WaterAvoidingRandomStrollGoal(this, 0.9D)); - this.goalSelector.addGoal(4, new LookAtPlayerGoal(this, Player.class, 12.0F)); - this.goalSelector.addGoal(5, new RandomLookAroundGoal(this)); - this.targetSelector.addGoal(1, new HurtByTargetGoal(this)); - this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true)); - } - - @Override - public void registerControllers(AnimatableManager.ControllerRegistrar controllers) { - controllers.add(new AnimationController<>(this, "main_controller", 2, this::mainAnimController)); - } - - @Override - public AnimatableInstanceCache getAnimatableInstanceCache() { - return this.geoCache; - } - - @Override - public void tick() { - super.tick(); - if (this.level().isClientSide) { - return; - } - - if (this.spitCooldownTicks > 0) { - this.spitCooldownTicks--; - } - - if (this.spitAnimationTicks > 0) { - this.spitAnimationTicks--; - this.entityData.set(SPIT_ANIM_TICKS, this.spitAnimationTicks); - if (this.spitReleaseTicks > 0 && --this.spitReleaseTicks == 0) { - this.fireSpitProjectile(); - } - } - } - - @Override - public boolean doHurtTarget(net.minecraft.world.entity.Entity target) { - boolean hurt = super.doHurtTarget(target); - if (hurt) { - this.playSound(SoundEvents.SPIDER_HURT, 0.7F, 0.8F + this.random.nextFloat() * 0.2F); - } - return hurt; - } - - @Override - protected SoundEvent getAmbientSound() { - return SoundEvents.SPIDER_AMBIENT; - } - - @Override - protected SoundEvent getHurtSound(DamageSource damageSource) { - return SoundEvents.SPIDER_HURT; - } - - @Override - protected SoundEvent getDeathSound() { - return SoundEvents.SPIDER_DEATH; - } - - @Override - protected void playStepSound(BlockPos pos, BlockState blockState) { - this.playSound(SoundEvents.SPIDER_STEP, 0.18F, 0.95F); - } - - private PlayState mainAnimController(AnimationState state) { - if (this.entityData.get(SPIT_ANIM_TICKS) > 0) { - return state.setAndContinue(SPIT_ANIM); - } - return state.setAndContinue(state.isMoving() ? WALK_ANIM : IDLE_ANIM); - } - - private boolean canSpitAt(LivingEntity target) { - return this.spitCooldownTicks <= 0 - && this.spitAnimationTicks <= 0 - && this.hasLineOfSight(target) - && this.distanceToSqr(target) <= SPIT_RANGE_SQR - && this.distanceToSqr(target) > MELEE_RANGE_SQR; - } - - private void startSpitAttack() { - this.spitCooldownTicks = SPIT_COOLDOWN_TICKS; - this.spitAnimationTicks = SPIT_ANIMATION_TICKS; - this.spitReleaseTicks = SPIT_RELEASE_TICKS; - this.entityData.set(SPIT_ANIM_TICKS, this.spitAnimationTicks); - } - - @SuppressWarnings("unchecked") - private void fireSpitProjectile() { - if (!(this.level() instanceof ServerLevel serverLevel)) { - return; - } - - LivingEntity target = this.getTarget(); - if (target == null || !target.isAlive()) { - return; - } - - EntityType projectileType = (EntityType) BuiltInRegistries.ENTITY_TYPE.getOptional( - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "spit_bug_projectile") - ).orElse(null); - if (projectileType == null) { - return; - } - - SpitBugProjectileEntity projectile = new SpitBugProjectileEntity(projectileType, this, serverLevel); - Vec3 origin = this.position() - .add(0.0D, this.getBbHeight() * 0.55D, 0.0D) - .add(this.getViewVector(0.0F).scale(1.35D)); - Vec3 aimPoint = target.getEyePosition().add(target.getDeltaMovement().scale(0.45D)); - Vec3 direction = aimPoint.subtract(origin).normalize(); - - projectile.setPos(origin.x, origin.y, origin.z); - projectile.shoot(direction.x, direction.y, direction.z, 1.05F, 0.0F); - serverLevel.addFreshEntity(projectile); - this.playSound(SoundEvents.SLIME_ATTACK, 1.0F, 0.85F + this.random.nextFloat() * 0.15F); - } - - private final class SpitAttackGoal extends Goal { - SpitAttackGoal() { - this.setFlags(EnumSet.of(Flag.MOVE, Flag.LOOK)); - } - - @Override - public boolean canUse() { - LivingEntity target = SpitBugEntity.this.getTarget(); - return target != null && target.isAlive(); - } - - @Override - public boolean canContinueToUse() { - return this.canUse(); - } - - @Override - public void tick() { - LivingEntity target = SpitBugEntity.this.getTarget(); - if (target == null) { - return; - } - - SpitBugEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F); - - if (SpitBugEntity.this.canSpitAt(target)) { - SpitBugEntity.this.getNavigation().stop(); - SpitBugEntity.this.startSpitAttack(); - return; - } - - if (SpitBugEntity.this.distanceToSqr(target) > 36.0D || !SpitBugEntity.this.hasLineOfSight(target)) { - SpitBugEntity.this.getNavigation().moveTo(target, 1.0D); - } else { - SpitBugEntity.this.getNavigation().stop(); - } - } - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/SpitBugProjectileEntity.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/SpitBugProjectileEntity.java deleted file mode 100644 index 34211277..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/entity/SpitBugProjectileEntity.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.craisinlord.antarchy.content.entity; - -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.projectile.ThrowableItemProjectile; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.EntityHitResult; -import net.minecraft.world.phys.Vec3; - -public class SpitBugProjectileEntity extends ThrowableItemProjectile { - private static final EntityDataAccessor LINGERING = - SynchedEntityData.defineId(SpitBugProjectileEntity.class, EntityDataSerializers.BOOLEAN); - private static final int MAX_FLIGHT_TICKS = 100; - private static final int LINGER_DURATION_TICKS = 300; - private static final int DIRECT_HIT_DAMAGE = 8; - private static final float LINGER_RADIUS = 1.65F; - - private boolean lingering; - private int lingeringTicks; - - public SpitBugProjectileEntity(EntityType entityType, Level level) { - super(entityType, level); - } - - public SpitBugProjectileEntity(EntityType entityType, LivingEntity owner, Level level) { - super(entityType, owner, level); - } - - @Override - protected void defineSynchedData(SynchedEntityData.Builder builder) { - super.defineSynchedData(builder); - builder.define(LINGERING, false); - } - - @Override - protected Item getDefaultItem() { - return Items.SLIME_BALL; - } - - @Override - protected double getDefaultGravity() { - return 0.03D; - } - - @Override - public boolean canBeCollidedWith() { - return false; - } - - @Override - public boolean isAttackable() { - return false; - } - - public boolean isLingering() { - return this.entityData.get(LINGERING); - } - - public float getRenderScale(float partialTick) { - if (!this.isLingering()) { - return 0.65F; - } - float progress = Math.min(1.0F, (this.lingeringTicks + partialTick) / 8.0F); - return 0.6F + progress * 0.5F; - } - - @Override - public void tick() { - if (this.isLingering()) { - this.tickLingering(); - return; - } - - super.tick(); - if (this.tickCount > MAX_FLIGHT_TICKS) { - this.discard(); - return; - } - - if (this.level().isClientSide) { - this.level().addParticle(ParticleTypes.ITEM_SLIME, this.getX(), this.getY(), this.getZ(), 0.0D, 0.0D, 0.0D); - } - } - - private void tickLingering() { - this.lingeringTicks++; - this.setDeltaMovement(Vec3.ZERO); - - if (this.level().isClientSide) { - double radius = 0.4D + this.random.nextDouble() * 0.45D; - this.level().addParticle( - ParticleTypes.ITEM_SLIME, - this.getX() + (this.random.nextDouble() - 0.5D) * radius, - this.getY() + 0.04D, - this.getZ() + (this.random.nextDouble() - 0.5D) * radius, - 0.0D, - 0.0D, - 0.0D - ); - return; - } - - if (this.lingeringTicks % 4 == 0) { - this.applyLingeringSpit(); - } - - if (this.lingeringTicks >= LINGER_DURATION_TICKS) { - this.discard(); - } - } - - private void applyLingeringSpit() { - for (LivingEntity target : this.level().getEntitiesOfClass( - LivingEntity.class, - this.getBoundingBox().inflate(LINGER_RADIUS, 0.6D, LINGER_RADIUS), - entity -> entity.isAlive() && entity != this.getOwner() - )) { - target.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 30, 3, false, true, true)); - target.makeStuckInBlock(Blocks.HONEY_BLOCK.defaultBlockState(), new Vec3(0.2D, 0.0D, 0.2D)); - } - - if (this.level() instanceof ServerLevel serverLevel) { - serverLevel.sendParticles(ParticleTypes.ITEM_SLIME, this.getX(), this.getY() + 0.05D, this.getZ(), 3, 0.45D, 0.02D, 0.45D, 0.0D); - } - } - - @Override - protected void onHitEntity(EntityHitResult result) { - if (!this.level().isClientSide && result.getEntity() instanceof LivingEntity livingTarget) { - Entity owner = this.getOwner(); - if (owner instanceof LivingEntity livingOwner) { - livingTarget.hurt(this.damageSources().mobProjectile(this, livingOwner), DIRECT_HIT_DAMAGE); - } else { - livingTarget.hurt(this.damageSources().magic(), DIRECT_HIT_DAMAGE); - } - livingTarget.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 80, 3, false, true, true)); - livingTarget.makeStuckInBlock(Blocks.HONEY_BLOCK.defaultBlockState(), new Vec3(0.25D, 0.0D, 0.25D)); - } - - this.beginLingering(result.getLocation()); - } - - @Override - protected void onHitBlock(BlockHitResult result) { - this.beginLingering(result.getLocation()); - } - - private void beginLingering(Vec3 location) { - if (this.isLingering()) { - return; - } - - this.lingering = true; - this.entityData.set(LINGERING, true); - this.lingeringTicks = 0; - this.noPhysics = true; - this.setPos(location.x, location.y + 0.05D, location.z); - this.setDeltaMovement(Vec3.ZERO); - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/kraken/KrakenEntity.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/kraken/KrakenEntity.java index be235d48..3d754405 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/entity/kraken/KrakenEntity.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/entity/kraken/KrakenEntity.java @@ -76,8 +76,6 @@ public class KrakenEntity extends Monster implements GeoEntity, MultipartEntityO private static final String AGGRO_TRIGGERED_KEY = "AggroTriggered"; private static final String GRAB_TARGET_KEY = "GrabTarget"; - private static final double BOSS_BAR_RANGE = 40.0D; - private static final int ATTACK_NONE = 0; private static final int ATTACK_GRAB = 1; private static final int ATTACK_SWING_LEFT = 2; @@ -263,8 +261,19 @@ public class KrakenEntity extends Monster implements GeoEntity, MultipartEntityO LivingEntity target = this.getTarget(); if ((target == null || !target.isAlive()) && this.tickCount % 10 == 0) { - Player nearbyPlayer = this.level().getNearestPlayer(this, BOSS_BAR_RANGE); - if (nearbyPlayer != null && this.canAttack(nearbyPlayer)) { + Player nearbyPlayer = null; + double nearestHorizontalDistanceSqr = Double.MAX_VALUE; + for (Player player : this.level().getEntitiesOfClass(Player.class, this.getBoundingBox().inflate(this.getBossBarRange(), 192.0D, this.getBossBarRange()))) { + if (!player.isAlive() || !this.canAttack(player) || !this.isWithinBossBarRange(player)) { + continue; + } + double horizontalDistanceSqr = this.horizontalDistanceToSqr(player); + if (horizontalDistanceSqr < nearestHorizontalDistanceSqr) { + nearestHorizontalDistanceSqr = horizontalDistanceSqr; + nearbyPlayer = player; + } + } + if (nearbyPlayer != null) { this.setTarget(nearbyPlayer); target = nearbyPlayer; } @@ -943,11 +952,12 @@ public class KrakenEntity extends Monster implements GeoEntity, MultipartEntityO return; } - AABB bossBarArea = this.getBoundingBox().inflate(BOSS_BAR_RANGE, 16.0D, BOSS_BAR_RANGE); + double bossBarRange = this.getBossBarRange(); + AABB bossBarArea = this.getBoundingBox().inflate(bossBarRange, 192.0D, bossBarRange); List nearbyPlayers = serverLevel.getEntitiesOfClass( ServerPlayer.class, bossBarArea, - player -> player.isAlive() && this.distanceToSqr(player) <= BOSS_BAR_RANGE * BOSS_BAR_RANGE + player -> player.isAlive() && this.isWithinBossBarRange(player) ); for (ServerPlayer player : List.copyOf(this.bossEvent.getPlayers())) { @@ -965,6 +975,21 @@ public class KrakenEntity extends Monster implements GeoEntity, MultipartEntityO this.setKrakenStormActive(!nearbyPlayers.isEmpty()); } + private double getBossBarRange() { + return Math.max(40.0D, com.craisinlord.antarchy.config.AntarchySettings.krakenBossBarRange()); + } + + private boolean isWithinBossBarRange(Entity entity) { + double bossBarRange = this.getBossBarRange(); + return this.horizontalDistanceToSqr(entity) <= bossBarRange * bossBarRange; + } + + private double horizontalDistanceToSqr(Entity entity) { + double dx = this.getX() - entity.getX(); + double dz = this.getZ() - entity.getZ(); + return dx * dx + dz * dz; + } + private void applyPhaseTwoBuffs() { AttributeInstance movementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED); if (movementSpeed != null && !movementSpeed.hasModifier(PHASE_TWO_SPEED_ID)) { diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/multipart/MultipartFramework.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/multipart/MultipartFramework.java index 7f36e286..ba954583 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/entity/multipart/MultipartFramework.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/entity/multipart/MultipartFramework.java @@ -33,7 +33,6 @@ public final class MultipartFramework { @Nullable private static PartFactory partFactory; private static NetworkBridge networkBridge = NOOP_BRIDGE; - private MultipartFramework() { } diff --git a/common/src/main/java/com/craisinlord/antarchy/content/item/BigBushBlockItem.java b/common/src/main/java/com/craisinlord/antarchy/content/item/BigBushBlockItem.java deleted file mode 100644 index f26a2c10..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/item/BigBushBlockItem.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.craisinlord.antarchy.content.item; - -import java.util.List; - -import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.block.Block; - -public class BigBushBlockItem extends BlockItem { - public BigBushBlockItem(Block block, Properties properties) { - super(block, properties); - } - - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { - tooltipComponents.add(Component.translatable("item.antarchy.big_bush.tooltip").withStyle(ChatFormatting.GRAY)); - super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/portal/PermanentPortalShape.java b/common/src/main/java/com/craisinlord/antarchy/content/portal/PermanentPortalShape.java index 9d84f0fa..a533f2e6 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/portal/PermanentPortalShape.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/portal/PermanentPortalShape.java @@ -19,7 +19,7 @@ public final class PermanentPortalShape { public static final int MIN_WIDTH = 2; public static final int MIN_HEIGHT = 3; public static final int MAX_SIZE = 21; - public static final int ACTIVE_SEARCH_RADIUS = 8; + public static final int ACTIVE_SEARCH_RADIUS = 24; private final PermanentPortalType type; private final Direction.Axis axis; diff --git a/common/src/main/java/com/craisinlord/antarchy/content/portal/PermanentPortalTeleporter.java b/common/src/main/java/com/craisinlord/antarchy/content/portal/PermanentPortalTeleporter.java index bfd18721..02abb785 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/portal/PermanentPortalTeleporter.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/portal/PermanentPortalTeleporter.java @@ -20,7 +20,7 @@ import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.Nullable; public final class PermanentPortalTeleporter { - private static final int SEARCH_RADIUS = 8; + private static final int SEARCH_RADIUS = 24; private static final int VERTICAL_SEARCH = 24; private PermanentPortalTeleporter() { diff --git a/common/src/main/java/com/craisinlord/antarchy/content/worldgen/BigBushWorldgenFeature.java b/common/src/main/java/com/craisinlord/antarchy/content/worldgen/BigBushWorldgenFeature.java deleted file mode 100644 index d2352a2f..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/worldgen/BigBushWorldgenFeature.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.craisinlord.antarchy.content.worldgen; - -import com.craisinlord.antarchy.content.block.BigBushBlock; -import com.mojang.serialization.Codec; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; - -import java.util.ArrayList; -import java.util.List; - -/** Places a {@link BigBushBlock} at a fixed growth stage (age), used for sparse overworld generation. */ -public class BigBushWorldgenFeature extends Feature { - private final int age; - - public BigBushWorldgenFeature(Codec codec, int age) { - super(codec); - this.age = age; - } - - @Override - public boolean place(FeaturePlaceContext context) { - WorldGenLevel level = context.level(); - BlockPos origin = context.origin(); - RandomSource random = context.random(); - - Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath("antarchy", "big_bush")); - if (!(block instanceof BigBushBlock)) { - return false; - } - - List facings = new ArrayList<>(Direction.Plane.HORIZONTAL.stream().toList()); - for (int i = facings.size() - 1; i > 0; i--) { - Direction swap = facings.set(random.nextInt(i + 1), facings.get(i)); - facings.set(i, swap); - } - - for (Direction facing : facings) { - BlockState grown = block.defaultBlockState().setValue(BigBushBlock.AGE, age).setValue(BigBushBlock.FACING, facing); - if (canPlace(level, origin, grown)) { - BigBushBlock.placeBushBlocks(level, origin, grown, Block.UPDATE_ALL); - return true; - } - if (age == 0) { - // Facing is irrelevant at age 0 (single block); no need to try every rotation. - break; - } - } - return false; - } - - private boolean canPlace(WorldGenLevel level, BlockPos origin, BlockState grown) { - if (!BigBushBlock.hasFullSupport(grown, level, origin)) { - return false; - } - List positions = new ArrayList<>(BigBushBlock.partPositions(grown, origin)); - positions.add(origin); - for (BlockPos pos : positions) { - if (!level.getBlockState(pos).canBeReplaced()) { - return false; - } - } - return true; - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/worldgen/VeryTallGrassWorldgenFeature.java b/common/src/main/java/com/craisinlord/antarchy/content/worldgen/VeryTallGrassWorldgenFeature.java deleted file mode 100644 index 40d379de..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/content/worldgen/VeryTallGrassWorldgenFeature.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.craisinlord.antarchy.content.worldgen; - -import com.craisinlord.antarchy.content.block.VeryTallGrassBlock; -import com.mojang.serialization.Codec; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; - -/** Places a single 3-tall {@link VeryTallGrassBlock} column, used for sparse overworld generation. */ -public class VeryTallGrassWorldgenFeature extends Feature { - public VeryTallGrassWorldgenFeature(Codec codec) { - super(codec); - } - - @Override - public boolean place(FeaturePlaceContext context) { - WorldGenLevel level = context.level(); - BlockPos pos = context.origin(); - if (!level.getBlockState(pos).isAir() - || !level.getBlockState(pos.above()).isAir() - || !level.getBlockState(pos.above(2)).isAir()) { - return false; - } - BlockPos below = pos.below(); - if (!level.getBlockState(below).isFaceSturdy(level, below, Direction.UP)) { - return false; - } - VeryTallGrassBlock.placeAt(level, pos, Block.UPDATE_ALL); - return true; - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/ElythiaFloraFeature.java b/common/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/ElythiaFloraFeature.java index 00a17a11..c7517782 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/ElythiaFloraFeature.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/ElythiaFloraFeature.java @@ -1,9 +1,8 @@ package com.craisinlord.antarchy.content.worldgen.elythia; -import com.craisinlord.antarchy.Antarchy; import com.craisinlord.antarchy.content.AntarchyObjects; -import com.craisinlord.antarchy.content.block.BigBushBlock; -import com.craisinlord.antarchy.content.block.VeryTallGrassBlock; +import com.craisinlord.sizeablefoliage.content.block.BigBushBlock; +import com.craisinlord.sizeablefoliage.content.block.VeryTallGrassBlock; import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -23,6 +22,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; public class ElythiaFloraFeature extends Feature { + private static final String SIZEABLE_FOLIAGE_MODID = "sizeable_foliage"; + private final Variant variant; public ElythiaFloraFeature(Codec codec, Variant variant) { @@ -127,7 +128,7 @@ public class ElythiaFloraFeature extends Feature { if (this.variant == Variant.TORCHFLOWER_FIELDS) { float roll = random.nextFloat(); if (roll < 0.14F) { - return placeDouble(level, plantPos, AntarchyObjects.TORCHFLOWER_BUSH.get().defaultBlockState()); + return placeDouble(level, plantPos, torchflowerBush().defaultBlockState()); } if (roll < 0.58F) { return placeSingle(level, plantPos, Blocks.TORCHFLOWER); @@ -201,17 +202,22 @@ public class ElythiaFloraFeature extends Feature { } private static Block veryShortGrass() { - Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_short_grass")); + Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath(SIZEABLE_FOLIAGE_MODID, "very_short_grass")); return block == Blocks.AIR ? Blocks.SHORT_GRASS : block; } private static Block veryTallGrass() { - Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_tall_grass")); + Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath(SIZEABLE_FOLIAGE_MODID, "very_tall_grass")); return block == Blocks.AIR ? Blocks.TALL_GRASS : block; } + private static Block torchflowerBush() { + Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath(SIZEABLE_FOLIAGE_MODID, "torchflower_bush")); + return block == Blocks.AIR ? Blocks.TORCHFLOWER : block; + } + private boolean placeBigBushes(WorldGenLevel level, BlockPos origin, RandomSource random, int radius) { - Block bushBlock = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush")); + Block bushBlock = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath(SIZEABLE_FOLIAGE_MODID, "big_bush")); if (!(bushBlock instanceof BigBushBlock)) { return false; } diff --git a/common/src/main/java/com/craisinlord/antarchy/mixins/BoneMealItemTorchflowerBushMixin.java b/common/src/main/java/com/craisinlord/antarchy/mixins/BoneMealItemTorchflowerBushMixin.java deleted file mode 100644 index 732ec7db..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/mixins/BoneMealItemTorchflowerBushMixin.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.craisinlord.antarchy.mixins; - -import com.craisinlord.antarchy.content.block.TorchflowerBushBlock; -import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.item.BoneMealItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.DoublePlantBlock; -import net.minecraft.world.level.block.state.BlockState; -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; - -@Mixin(BoneMealItem.class) -public abstract class BoneMealItemTorchflowerBushMixin { - @Inject(method = "useOn", at = @At("HEAD"), cancellable = true) - private void antarchy$growTorchflowerBush(UseOnContext context, CallbackInfoReturnable cir) { - Level level = context.getLevel(); - BlockPos pos = context.getClickedPos(); - BlockState clickedState = level.getBlockState(pos); - if (!clickedState.is(Blocks.TORCHFLOWER)) { - return; - } - - Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath("antarchy", "torchflower_bush")); - if (!(block instanceof TorchflowerBushBlock)) { - return; - } - - BlockState lowerState = block.defaultBlockState(); - if (!level.getBlockState(pos.above()).canBeReplaced() || !lowerState.canSurvive(level, pos)) { - return; - } - - if (!level.isClientSide) { - DoublePlantBlock.placeAt(level, lowerState, pos, Block.UPDATE_ALL); - if (context.getPlayer() == null || !context.getPlayer().getAbilities().instabuild) { - ItemStack stack = context.getItemInHand(); - stack.shrink(1); - } - level.levelEvent(1505, pos, 15); - } - - cir.setReturnValue(InteractionResult.sidedSuccess(level.isClientSide)); - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/mixins/BoneMealItemVeryTallGrassMixin.java b/common/src/main/java/com/craisinlord/antarchy/mixins/BoneMealItemVeryTallGrassMixin.java deleted file mode 100644 index 72b7b415..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/mixins/BoneMealItemVeryTallGrassMixin.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.craisinlord.antarchy.mixins; - -import com.craisinlord.antarchy.content.block.VeryTallGrassBlock; -import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.item.BoneMealItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.DoublePlantBlock; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; -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; - -@Mixin(BoneMealItem.class) -public abstract class BoneMealItemVeryTallGrassMixin { - @Inject(method = "useOn", at = @At("HEAD"), cancellable = true) - private void antarchy$growVeryTallGrass(UseOnContext context, CallbackInfoReturnable cir) { - Level level = context.getLevel(); - BlockPos pos = context.getClickedPos(); - BlockState clickedState = level.getBlockState(pos); - if (!clickedState.is(Blocks.TALL_GRASS)) { - return; - } - - BlockPos basePos = clickedState.getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.LOWER ? pos : pos.below(); - BlockState baseState = level.getBlockState(basePos); - BlockState middleState = level.getBlockState(basePos.above()); - if (!baseState.is(Blocks.TALL_GRASS) - || baseState.getValue(DoublePlantBlock.HALF) != DoubleBlockHalf.LOWER - || !middleState.is(Blocks.TALL_GRASS) - || middleState.getValue(DoublePlantBlock.HALF) != DoubleBlockHalf.UPPER) { - return; - } - - Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath("antarchy", "very_tall_grass")); - if (!(block instanceof VeryTallGrassBlock)) { - return; - } - - BlockState veryTallState = block.defaultBlockState(); - if (!level.getBlockState(basePos.above(2)).canBeReplaced() - || !veryTallState.canSurvive(level, basePos)) { - return; - } - - if (!level.isClientSide) { - VeryTallGrassBlock.placeAt(level, basePos, Block.UPDATE_ALL); - if (context.getPlayer() == null || !context.getPlayer().getAbilities().instabuild) { - ItemStack stack = context.getItemInHand(); - stack.shrink(1); - } - level.levelEvent(1505, basePos, 15); - } - - cir.setReturnValue(InteractionResult.sidedSuccess(level.isClientSide)); - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/mixins/TorchflowerBlockStateMixin.java b/common/src/main/java/com/craisinlord/antarchy/mixins/TorchflowerBlockStateMixin.java deleted file mode 100644 index 290dca10..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/mixins/TorchflowerBlockStateMixin.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.craisinlord.antarchy.mixins; - -import com.craisinlord.antarchy.config.AntarchySettings; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; -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; -@Mixin(BlockBehaviour.BlockStateBase.class) -/* - * Makes torchflowers glow when the config is on. - */ -public abstract class TorchflowerBlockStateMixin { - @Inject(method = "getLightEmission", at = @At("HEAD"), cancellable = true) - private void antarchy$makeTorchflowerGlow(CallbackInfoReturnable cir) { - BlockState state = (BlockState) (Object) this; - if (AntarchySettings.glowingTorchflowers() && state.is(Blocks.TORCHFLOWER)) { - cir.setReturnValue(10); - } - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/mixins/client/BlockRenderDispatcherBigBushMixin.java b/common/src/main/java/com/craisinlord/antarchy/mixins/client/BlockRenderDispatcherBigBushMixin.java deleted file mode 100644 index 3b948189..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/mixins/client/BlockRenderDispatcherBigBushMixin.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.craisinlord.antarchy.mixins.client; - -import com.craisinlord.antarchy.content.block.BigBushBlock; -import com.craisinlord.antarchy.content.block.BigBushPartBlock; -import com.craisinlord.antarchy.content.client.AlphaVertexConsumerProxy; -import com.craisinlord.antarchy.content.client.BigBushCameraHider; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.renderer.block.BlockRenderDispatcher; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; - -@Mixin(BlockRenderDispatcher.class) -public abstract class BlockRenderDispatcherBigBushMixin { - @ModifyVariable(method = "renderBatched", at = @At("HEAD"), argsOnly = true) - private VertexConsumer antarchy$fadeBigBushAroundCamera(VertexConsumer consumer, BlockState state, BlockPos pos) { - if ((state.getBlock() instanceof BigBushBlock || state.getBlock() instanceof BigBushPartBlock) - && BigBushCameraHider.shouldFade(pos)) { - return AlphaVertexConsumerProxy.wrap(consumer, 0.35F); - } - return consumer; - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/mixins/client/LivingEntityRendererBigBushMixin.java b/common/src/main/java/com/craisinlord/antarchy/mixins/client/LivingEntityRendererBigBushMixin.java deleted file mode 100644 index 926c1a78..00000000 --- a/common/src/main/java/com/craisinlord/antarchy/mixins/client/LivingEntityRendererBigBushMixin.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.craisinlord.antarchy.mixins.client; - -import com.craisinlord.antarchy.content.client.BigBushRenderHelper; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.LivingEntityRenderer; -import net.minecraft.world.entity.LivingEntity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.ModifyArg; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(LivingEntityRenderer.class) -public abstract class LivingEntityRendererBigBushMixin { - @Unique - private boolean antarchy$inBigBush; - - @Inject( - method = "render(Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", - at = @At("HEAD") - ) - private void antarchy$checkBigBush(LivingEntity entity, float entityYaw, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int packedLight, CallbackInfo ci) { - this.antarchy$inBigBush = BigBushRenderHelper.isInsideBigBush(entity); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Inject(method = "getRenderType", at = @At("HEAD"), cancellable = true) - private void antarchy$bigBushRenderType(LivingEntity entity, boolean bodyVisible, boolean translucent, boolean glowing, CallbackInfoReturnable cir) { - if (bodyVisible && !translucent && !glowing && BigBushRenderHelper.isInsideBigBush(entity)) { - cir.setReturnValue(RenderType.itemEntityTranslucentCull(((EntityRenderer) (Object) this).getTextureLocation(entity))); - } - } - - @Inject(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;)Z", at = @At("HEAD"), cancellable = true) - private void antarchy$hideBigBushNameTag(LivingEntity entity, CallbackInfoReturnable cir) { - if (BigBushRenderHelper.isInsideBigBush(entity)) { - cir.setReturnValue(false); - } - } - - @ModifyArg( - method = "render(Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/EntityModel;renderToBuffer(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;III)V"), - index = 4 - ) - private int antarchy$bigBushAlpha(int color) { - return this.antarchy$inBigBush && color == -1 ? 0x99FFFFFF : color; - } -} diff --git a/common/src/main/java/com/craisinlord/antarchy/mixins/client/MountedVehicleCameraMixin.java b/common/src/main/java/com/craisinlord/antarchy/mixins/client/MountedVehicleCameraMixin.java index 47605151..2ee0c36d 100644 --- a/common/src/main/java/com/craisinlord/antarchy/mixins/client/MountedVehicleCameraMixin.java +++ b/common/src/main/java/com/craisinlord/antarchy/mixins/client/MountedVehicleCameraMixin.java @@ -41,8 +41,8 @@ public abstract class MountedVehicleCameraMixin { } if (vehicle instanceof DorrieEntity) { - args.set(0, (Float) args.get(0) * 1.6F); - args.set(1, (Float) args.get(1) + 0.15F); + args.set(0, (Float) args.get(0) * 0.25F); + args.set(1, (Float) args.get(1) + 0.1F); args.set(2, (Float) args.get(2) + 0.55F); } } diff --git a/common/src/main/resources/antarchy-common.mixins.json b/common/src/main/resources/antarchy-common.mixins.json index 2a281ed4..c8baf76c 100644 --- a/common/src/main/resources/antarchy-common.mixins.json +++ b/common/src/main/resources/antarchy-common.mixins.json @@ -1,76 +1,70 @@ { - "required": true, - "package": "com.craisinlord.antarchy.mixins", - "plugin": "com.craisinlord.antarchy.mixins.AntarchyMixinPlugin", - "compatibilityLevel": "JAVA_21", - "mixins": [ - "AccessorRangedAttribute", - "BoneMealItemVeryTallGrassMixin", - "BoneMealItemTorchflowerBushMixin", - "BlockEntityTypeSignMixin", - "BloodglassMixin", - "DreamFireBlockMixin", - "DreamSandLowGravityMixin", - "FireVisualBaseFireBlockMixin", - "FireVisualEntityMixin", - "FlintAndSteelPortalIgnitionMixin", - "GlowVinesUnderLeavesMixin", - "NightmareSwordDamageMixin", - "ServerPlayerGameModeMixin", - "SquidzookaEnchantMixin", - "SquidzookaMultishotMixin", - "TorchflowerBlockStateMixin", - "gravity.AbstractArrowGravityMixin", - "gravity.BucketItemGravityMixin", - "gravity.ChunkMapAccessor", - "gravity.CrossbowItemGravityMixin", - "gravity.DirectionFacingMixin", - "gravity.EntityCollisionContextMixin", - "gravity.EntityGravityFrameMixin", - "gravity.EntityGravityMixin", - "gravity.EntityMoveMixin", - "gravity.ExplosionGravityMixin", - "gravity.FallingBlockEntityBlockDataMixin", - "gravity.FireworkRocketGravityMixin", - "gravity.GroundPathNavigationMixin", - "gravity.LivingEntityMixin", - "gravity.MobHurtMixin", - "gravity.PathNavigationAccessor", - "gravity.PathNavigationDebugMixin", - "gravity.PlayerAttackMixin", - "gravity.PlayerGravityMixin", - "gravity.PlayerPoseFitMixin", - "gravity.PlayerSneakMixin", - "gravity.ProjectileGravityMixin", - "gravity.ServerChunkCacheAccessor", - "gravity.ServerEntityAccessor", - "gravity.ServerGamePacketListenerMixin", - "gravity.ServerPlayerGravityMixin", - "gravity.ThrowableProjectileGravityMixin", - "gravity.TrackedEntityAccessor", - "multipart.EntityMultipartLifecycleMixin" - ], - "client": [ - "client.BlockRenderDispatcherBigBushMixin", - "client.CavarynSkyMixin", - "client.ElythiaSkyMixin", - "client.ElytraModelAccessor", - "client.GameRendererSwingThroughGrassMixin", - "client.LightningBoltRendererMixin", - "client.LivingEntityRendererBigBushMixin", - "client.MountedVehicleCameraMixin", - "client.ParalyzedMouseTurnMixin", - "client.ScreenEffectRendererFireVisualMixin", - "client.SplashManagerMixin", - "client.ThoraxisFogMixin", - "client.WolfRendererGrimMixin", - "gravity.client.CameraGravityMixin", - "gravity.client.ClientPacketListenerGravityMixin", - "gravity.client.EntityRenderDispatcherGravityMixin", - "gravity.client.FallingBlockRendererBlockEntityMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "minVersion": "0.8" + "required": true, + "package": "com.craisinlord.antarchy.mixins", + "plugin": "com.craisinlord.antarchy.mixins.AntarchyMixinPlugin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "AccessorRangedAttribute", + "BlockEntityTypeSignMixin", + "BloodglassMixin", + "DreamFireBlockMixin", + "DreamSandLowGravityMixin", + "FireVisualBaseFireBlockMixin", + "FireVisualEntityMixin", + "FlintAndSteelPortalIgnitionMixin", + "GlowVinesUnderLeavesMixin", + "NightmareSwordDamageMixin", + "ServerPlayerGameModeMixin", + "SquidzookaEnchantMixin", + "SquidzookaMultishotMixin", + "gravity.AbstractArrowGravityMixin", + "gravity.BucketItemGravityMixin", + "gravity.ChunkMapAccessor", + "gravity.CrossbowItemGravityMixin", + "gravity.DirectionFacingMixin", + "gravity.EntityCollisionContextMixin", + "gravity.EntityGravityFrameMixin", + "gravity.EntityGravityMixin", + "gravity.EntityMoveMixin", + "gravity.ExplosionGravityMixin", + "gravity.FallingBlockEntityBlockDataMixin", + "gravity.FireworkRocketGravityMixin", + "gravity.GroundPathNavigationMixin", + "gravity.LivingEntityMixin", + "gravity.MobHurtMixin", + "gravity.PathNavigationAccessor", + "gravity.PathNavigationDebugMixin", + "gravity.PlayerAttackMixin", + "gravity.PlayerGravityMixin", + "gravity.PlayerPoseFitMixin", + "gravity.PlayerSneakMixin", + "gravity.ProjectileGravityMixin", + "gravity.ServerChunkCacheAccessor", + "gravity.ServerEntityAccessor", + "gravity.ServerGamePacketListenerMixin", + "gravity.ServerPlayerGravityMixin", + "gravity.ThrowableProjectileGravityMixin", + "gravity.TrackedEntityAccessor", + "multipart.EntityMultipartLifecycleMixin" + ], + "client": [ + "client.ElythiaSkyMixin", + "client.ElytraModelAccessor", + "client.GameRendererSwingThroughGrassMixin", + "client.LightningBoltRendererMixin", + "client.MountedVehicleCameraMixin", + "client.ParalyzedMouseTurnMixin", + "client.ScreenEffectRendererFireVisualMixin", + "client.SplashManagerMixin", + "client.ThoraxisFogMixin", + "client.WolfRendererGrimMixin", + "gravity.client.CameraGravityMixin", + "gravity.client.ClientPacketListenerGravityMixin", + "gravity.client.EntityRenderDispatcherGravityMixin", + "gravity.client.FallingBlockRendererBlockEntityMixin" + ], + "injectors": { + "defaultRequire": 1 + }, + "minVersion": "0.8" } diff --git a/common/src/main/resources/assets/antarchy/animations/emperor_scorpion.animation.json b/common/src/main/resources/assets/antarchy/animations/emperor_scorpion.animation.json index 05be1d2a..ce875de5 100644 --- a/common/src/main/resources/assets/antarchy/animations/emperor_scorpion.animation.json +++ b/common/src/main/resources/assets/antarchy/animations/emperor_scorpion.animation.json @@ -5331,6 +5331,1590 @@ } } } + }, + "harden": { + "animation_length": 0.5417, + "bones": { + "right_mandibule": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.375": { + "pre": { + "vector": [-107.5, 0, 0] + }, + "post": { + "vector": [-107.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [-120, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-107.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_mandibule": { + "rotation": { + "0.375": { + "pre": { + "vector": [-107.5, 0, 0] + }, + "post": { + "vector": [-107.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [-120, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-107.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [12.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_arm": { + "rotation": { + "0.0": { + "post": { + "vector": [15.96462, 16.54425, 13.90465] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-15.05854, 26.48174, -25.94745] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_arm2": { + "rotation": { + "0.0": { + "post": { + "vector": [-26.01017, -75.88812, 29.64312] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_claw": { + "rotation": { + "0.0": { + "post": { + "vector": [-0.54143, -2.4407, 12.51153] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_claw_open": { + "rotation": { + "0.0": { + "post": { + "vector": [0, -32.5, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_arm": { + "rotation": { + "0.0": { + "post": { + "vector": [15.96462, -16.54425, -13.90465] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-15.05854, -26.48174, 25.94745] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_arm2": { + "rotation": { + "0.0": { + "post": { + "vector": [-26.01017, 75.88812, -29.64312] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_claw": { + "rotation": { + "0.0": { + "post": { + "vector": [-0.54143, 2.4407, -12.51153] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_claw_open": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 40, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "torso": { + "rotation": { + "0.0": { + "post": { + "vector": [-9.97552, -0.15113, -0.46411] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [17.52448, -0.15113, -0.46411] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "tail": { + "rotation": { + "0.0": { + "post": { + "vector": [55, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-62.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "tail2": { + "rotation": { + "0.0": { + "post": { + "vector": [92.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-145, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-1.72297, 17.16639, -38.21031] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-5.49824, 16.37564, -51.24195] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg2": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 90] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0.01826, 1.73134, 136.80371] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.375": { + "pre": { + "vector": [1.80191, -2.27789, 0.75121] + }, + "post": { + "vector": [1.80191, -2.27789, 0.75121] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg3": { + "rotation": { + "0.0": { + "post": { + "vector": [14.10576, -1.86677, -40.45934] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [13.60123, 4.2104, -64.72603] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 90] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 0, 145] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.375": { + "pre": { + "vector": [1.70318, -3.54515, -0.72874] + }, + "post": { + "vector": [1.70318, -3.54515, -0.72874] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back": { + "rotation": { + "0.0": { + "post": { + "vector": [24.22538, -12.71913, -44.36617] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [27.13034, -1.74132, -67.04592] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back2": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 90] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 0, 145] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.375": { + "pre": { + "vector": [1.3197, -2.84723, -0.38945] + }, + "post": { + "vector": [1.3197, -2.84723, -0.38945] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back3": { + "rotation": { + "0.0": { + "post": { + "vector": [39.98602, -25.67186, -53.11029] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [46.24426, -3.10601, -77.45876] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 90] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 0, 150] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.375": { + "pre": { + "vector": [2, -3.4641, 0] + }, + "post": { + "vector": [2, -3.4641, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-1.72297, -17.16639, 38.21031] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-5.49824, -16.37564, 51.24195] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg2": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -90] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0.01826, -1.73134, -136.80371] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.375": { + "pre": { + "vector": [-1.80191, -2.27789, 0.75121] + }, + "post": { + "vector": [-1.80191, -2.27789, 0.75121] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg3": { + "rotation": { + "0.0": { + "post": { + "vector": [14.10576, 1.86677, 40.45934] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [13.60123, -4.2104, 64.72603] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -90] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 0, -145] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.375": { + "pre": { + "vector": [-1.70318, -3.54515, -0.72874] + }, + "post": { + "vector": [-1.70318, -3.54515, -0.72874] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back": { + "rotation": { + "0.0": { + "post": { + "vector": [24.22538, 12.71913, 44.36617] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [27.13034, 1.74132, 67.04592] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back2": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -90] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 0, -145] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.375": { + "pre": { + "vector": [-1.3197, -2.84723, -0.38945] + }, + "post": { + "vector": [-1.3197, -2.84723, -0.38945] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back3": { + "rotation": { + "0.0": { + "post": { + "vector": [39.98602, 25.67186, 53.11029] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [46.24426, 3.10601, 77.45876] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -90] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 0, -150] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.375": { + "pre": { + "vector": [-2, -3.4641, 0] + }, + "post": { + "vector": [-2, -3.4641, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "body": { + "rotation": { + "vector": [-7.5, 0, 0] + }, + "position": { + "vector": [0, 2.97433, 0.39158] + } + } + } + }, + "harden_state": { + "loop": true, + "animation_length": 0.5, + "bones": { + "right_mandibule": { + "rotation": { + "0.0": { + "post": { + "vector": [-107.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_mandibule": { + "rotation": { + "0.0": { + "post": { + "vector": [-107.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_arm": { + "rotation": { + "0.0": { + "post": { + "vector": [-15.05854, 26.48174, -25.94745] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_arm2": { + "rotation": { + "0.0": { + "post": { + "vector": [-26.01017, -75.88812, 29.64312] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_claw": { + "rotation": { + "0.0": { + "post": { + "vector": [-0.54143, -2.4407, 12.51153] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_claw_open": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_arm": { + "rotation": { + "0.0": { + "post": { + "vector": [-15.05854, -26.48174, 25.94745] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_arm2": { + "rotation": { + "0.0": { + "post": { + "vector": [-26.01017, 75.88812, -29.64312] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_claw": { + "rotation": { + "0.0": { + "post": { + "vector": [-0.54143, 2.4407, -12.51153] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_claw_open": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "torso": { + "rotation": { + "0.0": { + "post": { + "vector": [17.52448, -0.15113, -0.46411] + }, + "lerp_mode": "catmullrom" + } + } + }, + "tail": { + "rotation": { + "0.0": { + "post": { + "vector": [-62.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "tail2": { + "rotation": { + "0.0": { + "post": { + "vector": [-145, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-5.49824, 16.37564, -51.24195] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg2": { + "rotation": { + "0.0": { + "post": { + "vector": [0.01826, 1.73134, 136.80371] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [1.80191, -2.27789, 0.75121] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg3": { + "rotation": { + "0.0": { + "post": { + "vector": [13.60123, 4.2104, -64.72603] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 145] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [1.70318, -3.54515, -0.72874] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back": { + "rotation": { + "0.0": { + "post": { + "vector": [27.13034, -1.74132, -67.04592] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back2": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 145] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [1.3197, -2.84723, -0.38945] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back3": { + "rotation": { + "0.0": { + "post": { + "vector": [46.24426, -3.10601, -77.45876] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 150] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [2, -3.4641, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-5.49824, -16.37564, 51.24195] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg2": { + "rotation": { + "0.0": { + "post": { + "vector": [0.01826, -1.73134, -136.80371] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [-1.80191, -2.27789, 0.75121] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg3": { + "rotation": { + "0.0": { + "post": { + "vector": [13.60123, -4.2104, 64.72603] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -145] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [-1.70318, -3.54515, -0.72874] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back": { + "rotation": { + "0.0": { + "post": { + "vector": [27.13034, 1.74132, 67.04592] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back2": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -145] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [-1.3197, -2.84723, -0.38945] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back3": { + "rotation": { + "0.0": { + "post": { + "vector": [46.24426, 3.10601, 77.45876] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -150] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [-2, -3.4641, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "Emperor_scorpion": { + "rotation": { + "vector": [-7.5, 0, 0] + }, + "position": { + "vector": [0, 2.97433, 0.39158] + } + } + } + }, + "end_of_harden_state": { + "animation_length": 1, + "bones": { + "right_mandibule": { + "rotation": { + "0.0": { + "post": { + "vector": [-107.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_mandibule": { + "rotation": { + "0.0": { + "post": { + "vector": [-107.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_arm": { + "rotation": { + "0.0": { + "post": { + "vector": [-15.05854, 26.48174, -25.94745] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [15.96462, 16.54425, 13.90465] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_arm2": { + "rotation": { + "0.0": { + "post": { + "vector": [-26.01017, -75.88812, 29.64312] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-26.01017, -75.88812, 29.64312] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_claw": { + "rotation": { + "0.0": { + "post": { + "vector": [-0.54143, -2.4407, 12.51153] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-0.54143, -2.4407, 12.51153] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_claw_open": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, -32.5, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_arm": { + "rotation": { + "0.0": { + "post": { + "vector": [-15.05854, -26.48174, 25.94745] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [15.96462, -16.54425, -13.90465] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_arm2": { + "rotation": { + "0.0": { + "post": { + "vector": [-26.01017, 75.88812, -29.64312] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-26.01017, 75.88812, -29.64312] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_claw": { + "rotation": { + "0.0": { + "post": { + "vector": [-0.54143, 2.4407, -12.51153] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-0.54143, 2.4407, -12.51153] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_claw_open": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 40, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "torso": { + "rotation": { + "0.0": { + "post": { + "vector": [17.52448, -0.15113, -0.46411] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-9.97552, -0.15113, -0.46411] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "1.0": { + "pre": { + "vector": [0, 0, 0] + }, + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "tail": { + "rotation": { + "0.0": { + "post": { + "vector": [-62.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [55, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "tail2": { + "rotation": { + "0.0": { + "post": { + "vector": [-145, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [92.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-5.49824, 16.37564, -51.24195] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-1.72297, 17.16639, -38.21031] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg2": { + "rotation": { + "0.0": { + "post": { + "vector": [0.01826, 1.73134, 136.80371] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 90] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [1.80191, -2.27789, 0.75121] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg3": { + "rotation": { + "0.0": { + "post": { + "vector": [13.60123, 4.2104, -64.72603] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [14.10576, -1.86677, -40.45934] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 145] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 90] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [1.70318, -3.54515, -0.72874] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back": { + "rotation": { + "0.0": { + "post": { + "vector": [27.13034, -1.74132, -67.04592] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [24.22538, -12.71913, -44.36617] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back2": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 145] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 90] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [1.3197, -2.84723, -0.38945] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back3": { + "rotation": { + "0.0": { + "post": { + "vector": [46.24426, -3.10601, -77.45876] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [39.98602, -25.67186, -53.11029] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg_back4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 150] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 90] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [2, -3.4641, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-5.49824, -16.37564, 51.24195] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-1.72297, -17.16639, 38.21031] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg2": { + "rotation": { + "0.0": { + "post": { + "vector": [0.01826, -1.73134, -136.80371] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, -90] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [-1.80191, -2.27789, 0.75121] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg3": { + "rotation": { + "0.0": { + "post": { + "vector": [13.60123, -4.2104, 64.72603] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [14.10576, 1.86677, 40.45934] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -145] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, -90] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [-1.70318, -3.54515, -0.72874] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back": { + "rotation": { + "0.0": { + "post": { + "vector": [27.13034, 1.74132, 67.04592] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [24.22538, 12.71913, 44.36617] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back2": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -145] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, -90] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [-1.3197, -2.84723, -0.38945] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back3": { + "rotation": { + "0.0": { + "post": { + "vector": [46.24426, 3.10601, 77.45876] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [39.98602, 25.67186, 53.11029] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg_back4": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -150] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, -90] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [-2, -3.4641, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "body": { + "rotation": { + "1.0": { + "pre": { + "vector": [-7.5, 0, 0] + }, + "post": { + "vector": [-7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "1.0": { + "pre": { + "vector": [0, 2.97433, 0.39158] + }, + "post": { + "vector": [0, 2.97433, 0.39158] + }, + "lerp_mode": "catmullrom" + } + } + }, + "Emperor_scorpion": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + } + } } } } \ No newline at end of file diff --git a/common/src/main/resources/assets/antarchy/animations/glimmer.animation.json b/common/src/main/resources/assets/antarchy/animations/glimmer.animation.json new file mode 100644 index 00000000..9084e98c --- /dev/null +++ b/common/src/main/resources/assets/antarchy/animations/glimmer.animation.json @@ -0,0 +1,1669 @@ +{ + "format_version": "1.8.0", + "animations": { + "idle": { + "loop": true, + "animation_length": 2, + "bones": { + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [15, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [15, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_ear": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 22.5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 15] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, 0, 22.5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_ear": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -22.5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, -15] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, 0, -22.5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": { + "vector": [-5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [-5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "torso": { + "rotation": { + "0.0": { + "post": { + "vector": [-7.72, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-8.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": { + "vector": [-6.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [-7.72, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + } + } + }, + "walk": { + "loop": true, + "animation_length": 1, + "bones": { + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "torso": { + "rotation": { + "0.0": { + "post": { + "vector": [-1.25, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-1.25, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "vector": [28.85, 0, 0] + }, + "0.1667": { + "pre": { + "vector": [8.75, 0, 0] + }, + "post": { + "vector": [8.75, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-6.84, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + }, + "0.5833": { + "vector": [24.17, 0, 0] + }, + "0.75": { + "pre": { + "vector": [37.08, 0, 0] + }, + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.9583": { + "vector": [32.5, 0, 0] + }, + "1.0": { + "vector": [28.85, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 4.5, -7.5] + }, + "0.2083": { + "pre": { + "vector": [0, 2.83, -7.08] + }, + "post": { + "vector": [0, 2.83, -7.08] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, -0.76, -4.19] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + }, + "0.5417": { + "vector": [0, -0.41, 0.92] + }, + "0.5833": { + "vector": [0, -1.83, 1.83] + }, + "0.7083": { + "pre": { + "vector": [0, -2.1, -0.4] + }, + "post": { + "vector": [0, -2.1, -0.4] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 2.45, -4.7] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 4.5, -7.5] + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0833": { + "vector": [24.17, 0, 0] + }, + "0.25": { + "pre": { + "vector": [37.08, 0, 0] + }, + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "vector": [32.5, 0, 0] + }, + "0.6667": { + "pre": { + "vector": [8.75, 0, 0] + }, + "post": { + "vector": [8.75, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [-6.84, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, -0.41, 0.92] + }, + "0.0833": { + "vector": [0, -1.83, 1.83] + }, + "0.2083": { + "pre": { + "vector": [0, -2.1, -0.4] + }, + "post": { + "vector": [0, -2.1, -0.4] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 2.45, -4.7] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 4.5, -7.5] + }, + "0.7083": { + "pre": { + "vector": [0, 2.83, -7.08] + }, + "post": { + "vector": [0, 2.83, -7.08] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [0, -0.76, -4.19] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] + } + } + }, + "back_right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0.85, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [-6.84, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [24.17, 0, 0] + }, + "0.5": { + "pre": { + "vector": [37.08, 0, 0] + }, + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.7083": { + "vector": [32.5, 0, 0] + }, + "0.9167": { + "pre": { + "vector": [8.75, 0, 0] + }, + "post": { + "vector": [8.75, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0.85, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, -0.58, -6.56] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, -1.76, -4.19] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [0, -0.83, 1.83] + }, + "0.4583": { + "pre": { + "vector": [0, 0.9, -0.4] + }, + "post": { + "vector": [0, 0.9, -0.4] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [0, 3.45, -4.7] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "vector": [0, 4.5, -7.5] + }, + "0.9583": { + "pre": { + "vector": [0, 0.83, -7.08] + }, + "post": { + "vector": [0, 0.83, -7.08] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, -0.58, -6.56] + }, + "lerp_mode": "catmullrom" + } + } + }, + "back_left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.2083": { + "vector": [32.5, 0, 0] + }, + "0.4167": { + "pre": { + "vector": [8.75, 0, 0] + }, + "post": { + "vector": [8.75, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0.85, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-6.84, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "vector": [0, 0, 0] + }, + "0.8333": { + "vector": [24.17, 0, 0] + }, + "1.0": { + "pre": { + "vector": [37.08, 0, 0] + }, + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 1.74, -1.74] + }, + "lerp_mode": "catmullrom" + }, + "0.0833": { + "post": { + "vector": [0, 3.45, -4.7] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "vector": [0, 4.5, -7.5] + }, + "0.4583": { + "pre": { + "vector": [0, 2.83, -7.08] + }, + "post": { + "vector": [0, 2.83, -7.08] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 2.42, -6.56] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, -1.76, -4.19] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "vector": [0, -2, 0] + }, + "0.8333": { + "vector": [0, -0.83, 1.83] + }, + "0.9583": { + "pre": { + "vector": [0, 0.9, -0.4] + }, + "post": { + "vector": [0, 0.9, -0.4] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 1.74, -1.74] + }, + "lerp_mode": "catmullrom" + } + } + }, + "body": { + "rotation": { + "vector": [0, 0, 0] + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, 0, 0] + }, + "0.1667": { + "pre": { + "vector": [0, 2, 0] + }, + "post": { + "vector": [0, 2, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 2.25, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 2, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "vector": [0, 1, 0] + }, + "0.5": { + "vector": [0, 0, 0] + }, + "0.5417": { + "vector": [0, 0, 0] + }, + "0.6667": { + "pre": { + "vector": [0, 2, 0] + }, + "post": { + "vector": [0, 2, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [0, 2.25, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 2, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.9583": { + "vector": [0, 1, 0] + }, + "1.0": { + "vector": [0, 0, 0] + } + } + } + } + }, + "run": { + "loop": true, + "animation_length": 0.5, + "bones": { + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [-15, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": { + "vector": [-10, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-15, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [22.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-15.98, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": { + "vector": [-32.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "vector": [-15.19, 0, 0] + }, + "0.1667": { + "vector": [0, 0, 0] + }, + "0.25": { + "vector": [32.5, 0, 0] + }, + "0.375": { + "pre": { + "vector": [52.5, 0, 0] + }, + "post": { + "vector": [52.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-15.98, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 2, -3] + }, + "lerp_mode": "catmullrom" + }, + "0.0833": { + "post": { + "vector": [0, 0.5, -1.5] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "vector": [0, 0.19, -0.72] + }, + "0.1667": { + "vector": [0, 0, 0] + }, + "0.2083": { + "vector": [0, -0.5, 1] + }, + "0.25": { + "vector": [0, -2, 2] + }, + "0.375": { + "pre": { + "vector": [0, 1, 0] + }, + "post": { + "vector": [0, 1, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 2, -3] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "vector": [-15.19, 0, 0] + }, + "0.0417": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [32.5, 0, 0] + }, + "0.25": { + "pre": { + "vector": [52.5, 0, 0] + }, + "post": { + "vector": [52.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [-32.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [-15.19, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0.19, -0.72] + }, + "0.0417": { + "vector": [0, 0, 0] + }, + "0.0833": { + "vector": [0, -0.5, 1] + }, + "0.125": { + "vector": [0, -2, 2] + }, + "0.25": { + "pre": { + "vector": [0, 1, 0] + }, + "post": { + "vector": [0, 1, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 2, -3] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": { + "vector": [0, 0.5, -1.5] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0.19, -0.72] + } + } + }, + "back_right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "vector": [0, 0, 0] + }, + "0.2083": { + "vector": [40, 0, 0] + }, + "0.3333": { + "pre": { + "vector": [35.83, 0, 0] + }, + "post": { + "vector": [35.83, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 2.01, -2.12] + }, + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": { + "vector": [0, 0.69, -1.44] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "vector": [0, 0, 0] + }, + "0.1667": { + "vector": [0, -1, 2] + }, + "0.2083": { + "vector": [0, -0.33, 2.33] + }, + "0.2917": { + "pre": { + "vector": [0, 1, 3] + }, + "post": { + "vector": [0, 1, 3] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": { + "vector": [0, 3, -2] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 2.01, -2.12] + }, + "lerp_mode": "catmullrom" + } + } + }, + "back_left_leg": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0833": { + "vector": [40, 0, 0] + }, + "0.2083": { + "pre": { + "vector": [35.83, 0, 0] + }, + "post": { + "vector": [35.83, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, -1, 2] + }, + "0.0833": { + "vector": [0, -0.33, 2.33] + }, + "0.1667": { + "pre": { + "vector": [0, 1, 3] + }, + "post": { + "vector": [0, 1, 3] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 3, -2] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0.69, -1.44] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + } + } + }, + "body": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0833": { + "vector": [2.5, 0, 0] + }, + "0.2083": { + "pre": { + "vector": [5, 0, 0] + }, + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 2] + }, + "0.0833": { + "vector": [0, -1, 4] + }, + "0.2083": { + "pre": { + "vector": [0, 0.5, 5.25] + }, + "post": { + "vector": [0, 0.5, 5.25] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 2, 3.75] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 2] + } + } + } + } + }, + "quirk": { + "animation_length": 1, + "bones": { + "head": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "pre": { + "vector": [-7.5, 0, 7.5] + }, + "post": { + "vector": [-7.5, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [10, 0, -7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [10, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [-5, 0, 2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.7917": { + "vector": [0, 0, 0] + }, + "1.0": { + "vector": [0, 0, 0] + } + } + }, + "right_ear": { + "rotation": { + "0.75": { + "vector": [0, 0, 0] + }, + "0.7917": { + "pre": { + "vector": [-12.5, -30, 7.5] + }, + "post": { + "vector": [-12.5, -30, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [-25.84, -26.02, 6.5] + }, + "lerp_mode": "catmullrom" + }, + "0.9167": { + "vector": [0, 0, 0] + } + } + }, + "left_ear": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.6667": { + "vector": [0, 0, 0] + }, + "0.7083": { + "pre": { + "vector": [-12.5, 30, -7.5] + }, + "post": { + "vector": [-12.5, 30, -7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [-25.84, 26.02, -6.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "vector": [0, 0, 0] + } + } + }, + "neck": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0833": { + "pre": { + "vector": [0, 0, 5] + }, + "post": { + "vector": [0, 0, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": { + "vector": [0, 0, -12.5] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 0, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 0, -5] + }, + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] + } + } + }, + "torso": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "pre": { + "vector": [0, 0, -7.5] + }, + "post": { + "vector": [0, 0, -7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, 15] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, -10] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "back_right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "back_left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/antarchy/animations/glimmer_baby.animation.json b/common/src/main/resources/assets/antarchy/animations/glimmer_baby.animation.json new file mode 100644 index 00000000..9084e98c --- /dev/null +++ b/common/src/main/resources/assets/antarchy/animations/glimmer_baby.animation.json @@ -0,0 +1,1669 @@ +{ + "format_version": "1.8.0", + "animations": { + "idle": { + "loop": true, + "animation_length": 2, + "bones": { + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [15, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [15, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_ear": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 22.5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 15] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, 0, 22.5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_ear": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, -22.5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, -15] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, 0, -22.5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": { + "vector": [-5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [-5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "torso": { + "rotation": { + "0.0": { + "post": { + "vector": [-7.72, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-8.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": { + "vector": [-6.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [-7.72, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + } + } + }, + "walk": { + "loop": true, + "animation_length": 1, + "bones": { + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "torso": { + "rotation": { + "0.0": { + "post": { + "vector": [-1.25, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-1.25, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "vector": [28.85, 0, 0] + }, + "0.1667": { + "pre": { + "vector": [8.75, 0, 0] + }, + "post": { + "vector": [8.75, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-6.84, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + }, + "0.5833": { + "vector": [24.17, 0, 0] + }, + "0.75": { + "pre": { + "vector": [37.08, 0, 0] + }, + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.9583": { + "vector": [32.5, 0, 0] + }, + "1.0": { + "vector": [28.85, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 4.5, -7.5] + }, + "0.2083": { + "pre": { + "vector": [0, 2.83, -7.08] + }, + "post": { + "vector": [0, 2.83, -7.08] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, -0.76, -4.19] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + }, + "0.5417": { + "vector": [0, -0.41, 0.92] + }, + "0.5833": { + "vector": [0, -1.83, 1.83] + }, + "0.7083": { + "pre": { + "vector": [0, -2.1, -0.4] + }, + "post": { + "vector": [0, -2.1, -0.4] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 2.45, -4.7] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 4.5, -7.5] + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0833": { + "vector": [24.17, 0, 0] + }, + "0.25": { + "pre": { + "vector": [37.08, 0, 0] + }, + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "vector": [32.5, 0, 0] + }, + "0.6667": { + "pre": { + "vector": [8.75, 0, 0] + }, + "post": { + "vector": [8.75, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [-6.84, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, -0.41, 0.92] + }, + "0.0833": { + "vector": [0, -1.83, 1.83] + }, + "0.2083": { + "pre": { + "vector": [0, -2.1, -0.4] + }, + "post": { + "vector": [0, -2.1, -0.4] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 2.45, -4.7] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 4.5, -7.5] + }, + "0.7083": { + "pre": { + "vector": [0, 2.83, -7.08] + }, + "post": { + "vector": [0, 2.83, -7.08] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [0, -0.76, -4.19] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] + } + } + }, + "back_right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0.85, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [-6.84, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [24.17, 0, 0] + }, + "0.5": { + "pre": { + "vector": [37.08, 0, 0] + }, + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.7083": { + "vector": [32.5, 0, 0] + }, + "0.9167": { + "pre": { + "vector": [8.75, 0, 0] + }, + "post": { + "vector": [8.75, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0.85, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, -0.58, -6.56] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, -1.76, -4.19] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [0, -0.83, 1.83] + }, + "0.4583": { + "pre": { + "vector": [0, 0.9, -0.4] + }, + "post": { + "vector": [0, 0.9, -0.4] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [0, 3.45, -4.7] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "vector": [0, 4.5, -7.5] + }, + "0.9583": { + "pre": { + "vector": [0, 0.83, -7.08] + }, + "post": { + "vector": [0, 0.83, -7.08] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, -0.58, -6.56] + }, + "lerp_mode": "catmullrom" + } + } + }, + "back_left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.2083": { + "vector": [32.5, 0, 0] + }, + "0.4167": { + "pre": { + "vector": [8.75, 0, 0] + }, + "post": { + "vector": [8.75, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0.85, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-6.84, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "vector": [0, 0, 0] + }, + "0.8333": { + "vector": [24.17, 0, 0] + }, + "1.0": { + "pre": { + "vector": [37.08, 0, 0] + }, + "post": { + "vector": [37.08, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 1.74, -1.74] + }, + "lerp_mode": "catmullrom" + }, + "0.0833": { + "post": { + "vector": [0, 3.45, -4.7] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "vector": [0, 4.5, -7.5] + }, + "0.4583": { + "pre": { + "vector": [0, 2.83, -7.08] + }, + "post": { + "vector": [0, 2.83, -7.08] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 2.42, -6.56] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, -1.76, -4.19] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "vector": [0, -2, 0] + }, + "0.8333": { + "vector": [0, -0.83, 1.83] + }, + "0.9583": { + "pre": { + "vector": [0, 0.9, -0.4] + }, + "post": { + "vector": [0, 0.9, -0.4] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 1.74, -1.74] + }, + "lerp_mode": "catmullrom" + } + } + }, + "body": { + "rotation": { + "vector": [0, 0, 0] + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, 0, 0] + }, + "0.1667": { + "pre": { + "vector": [0, 2, 0] + }, + "post": { + "vector": [0, 2, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 2.25, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 2, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "vector": [0, 1, 0] + }, + "0.5": { + "vector": [0, 0, 0] + }, + "0.5417": { + "vector": [0, 0, 0] + }, + "0.6667": { + "pre": { + "vector": [0, 2, 0] + }, + "post": { + "vector": [0, 2, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [0, 2.25, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 2, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.9583": { + "vector": [0, 1, 0] + }, + "1.0": { + "vector": [0, 0, 0] + } + } + } + } + }, + "run": { + "loop": true, + "animation_length": 0.5, + "bones": { + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [-15, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": { + "vector": [-10, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-15, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [22.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-15.98, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": { + "vector": [-32.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "vector": [-15.19, 0, 0] + }, + "0.1667": { + "vector": [0, 0, 0] + }, + "0.25": { + "vector": [32.5, 0, 0] + }, + "0.375": { + "pre": { + "vector": [52.5, 0, 0] + }, + "post": { + "vector": [52.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-15.98, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 2, -3] + }, + "lerp_mode": "catmullrom" + }, + "0.0833": { + "post": { + "vector": [0, 0.5, -1.5] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "vector": [0, 0.19, -0.72] + }, + "0.1667": { + "vector": [0, 0, 0] + }, + "0.2083": { + "vector": [0, -0.5, 1] + }, + "0.25": { + "vector": [0, -2, 2] + }, + "0.375": { + "pre": { + "vector": [0, 1, 0] + }, + "post": { + "vector": [0, 1, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 2, -3] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "vector": [-15.19, 0, 0] + }, + "0.0417": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [32.5, 0, 0] + }, + "0.25": { + "pre": { + "vector": [52.5, 0, 0] + }, + "post": { + "vector": [52.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [-32.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [-15.19, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0.19, -0.72] + }, + "0.0417": { + "vector": [0, 0, 0] + }, + "0.0833": { + "vector": [0, -0.5, 1] + }, + "0.125": { + "vector": [0, -2, 2] + }, + "0.25": { + "pre": { + "vector": [0, 1, 0] + }, + "post": { + "vector": [0, 1, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [0, 2, -3] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": { + "vector": [0, 0.5, -1.5] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0.19, -0.72] + } + } + }, + "back_right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [-17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "vector": [0, 0, 0] + }, + "0.2083": { + "vector": [40, 0, 0] + }, + "0.3333": { + "pre": { + "vector": [35.83, 0, 0] + }, + "post": { + "vector": [35.83, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 2.01, -2.12] + }, + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": { + "vector": [0, 0.69, -1.44] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "vector": [0, 0, 0] + }, + "0.1667": { + "vector": [0, -1, 2] + }, + "0.2083": { + "vector": [0, -0.33, 2.33] + }, + "0.2917": { + "pre": { + "vector": [0, 1, 3] + }, + "post": { + "vector": [0, 1, 3] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": { + "vector": [0, 3, -2] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 2.01, -2.12] + }, + "lerp_mode": "catmullrom" + } + } + }, + "back_left_leg": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0833": { + "vector": [40, 0, 0] + }, + "0.2083": { + "pre": { + "vector": [35.83, 0, 0] + }, + "post": { + "vector": [35.83, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, -1, 2] + }, + "0.0833": { + "vector": [0, -0.33, 2.33] + }, + "0.1667": { + "pre": { + "vector": [0, 1, 3] + }, + "post": { + "vector": [0, 1, 3] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 3, -2] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0.69, -1.44] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + } + } + }, + "body": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0833": { + "vector": [2.5, 0, 0] + }, + "0.2083": { + "pre": { + "vector": [5, 0, 0] + }, + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 2] + }, + "0.0833": { + "vector": [0, -1, 4] + }, + "0.2083": { + "pre": { + "vector": [0, 0.5, 5.25] + }, + "post": { + "vector": [0, 0.5, 5.25] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 2, 3.75] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "vector": [0, 0, 2] + } + } + } + } + }, + "quirk": { + "animation_length": 1, + "bones": { + "head": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "pre": { + "vector": [-7.5, 0, 7.5] + }, + "post": { + "vector": [-7.5, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [10, 0, -7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [10, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [-5, 0, 2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.7917": { + "vector": [0, 0, 0] + }, + "1.0": { + "vector": [0, 0, 0] + } + } + }, + "right_ear": { + "rotation": { + "0.75": { + "vector": [0, 0, 0] + }, + "0.7917": { + "pre": { + "vector": [-12.5, -30, 7.5] + }, + "post": { + "vector": [-12.5, -30, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [-25.84, -26.02, 6.5] + }, + "lerp_mode": "catmullrom" + }, + "0.9167": { + "vector": [0, 0, 0] + } + } + }, + "left_ear": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.6667": { + "vector": [0, 0, 0] + }, + "0.7083": { + "pre": { + "vector": [-12.5, 30, -7.5] + }, + "post": { + "vector": [-12.5, 30, -7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [-25.84, 26.02, -6.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "vector": [0, 0, 0] + } + } + }, + "neck": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0833": { + "pre": { + "vector": [0, 0, 5] + }, + "post": { + "vector": [0, 0, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": { + "vector": [0, 0, -12.5] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [0, 0, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 0, -5] + }, + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] + } + } + }, + "torso": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "pre": { + "vector": [0, 0, -7.5] + }, + "post": { + "vector": [0, 0, -7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, 15] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, -10] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "back_right_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "back_left_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 7.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, -2.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [2, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/antarchy/animations/spit_bug.animation.json b/common/src/main/resources/assets/antarchy/animations/spit_bug.animation.json deleted file mode 100644 index 04f7b81c..00000000 --- a/common/src/main/resources/assets/antarchy/animations/spit_bug.animation.json +++ /dev/null @@ -1,2625 +0,0 @@ -{ - "format_version": "1.8.0", - "animations": { - "idle": { - "loop": true, - "animation_length": 2.25, - "bones": { - "body": { - "rotation": { - "0.0": { - "post": { - "vector": [-0.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-0.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.125": { - "post": { - "vector": [0.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.75": { - "post": { - "vector": [0.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [-0.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [7.1226, 29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [7.1226, 29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightEye": { - "rotation": { - "0.0": { - "post": { - "vector": [-25, 25, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [-25, 25, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightGrip": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.125": { - "post": { - "vector": [0, 15, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 20, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "root": { - "position": { - "0.0": { - "post": { - "vector": [0, -11.5, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, -11.5, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [-7.1226, -29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [-7.1226, -29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftEye": { - "rotation": { - "0.0": { - "post": { - "vector": [-25, -25, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [-25, -25, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftGrip": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -20, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.125": { - "post": { - "vector": [0, -15, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, -20, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightAntenna": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 60, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.125": { - "post": { - "vector": [0, 55, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 60, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightArm": { - "rotation": { - "0.0": { - "post": { - "vector": [5, 17.5, -5] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [7.5, 17.5, -5] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [5, 17.5, -5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightElbow": { - "rotation": { - "0.0": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.125": { - "post": { - "vector": [-35, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightClaw": { - "rotation": { - "0.0": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": { - "vector": [50, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftAntenna": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -60, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.125": { - "post": { - "vector": [0, -55, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, -60, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftArm": { - "rotation": { - "0.0": { - "post": { - "vector": [5, -17.5, 5] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [7.5, -17.5, 5] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [5, -17.5, 5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftElbow": { - "rotation": { - "0.0": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.125": { - "post": { - "vector": [-35, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftClaw": { - "rotation": { - "0.0": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": { - "vector": [50, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [-7.1226, 29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [-7.1226, 29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [7.1226, -29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [7.1226, -29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "2.25": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - } - } - } - } - }, - "walk": { - "loop": true, - "animation_length": 0.6667, - "bones": { - "backRightThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [0.9, 25.37, 22.42] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-14.7966, -19.965, 19.6746] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [-12.2252, -29.0774, 13.585] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [13.6745, 58.6061, 23.203] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0.9, 25.37, 22.42] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 22.5] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, 57.5] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, 22.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 35] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, -30] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, 35] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -42.5] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, 22.5] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, -42.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightEye": { - "rotation": { - "0.0": { - "post": { - "vector": [-25, 25, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightGrip": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 30, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, -30, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 30, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, -30, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 30, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "root": { - "rotation": { - "0.0": { - "post": { - "vector": [-5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.0833": { - "post": { - "vector": [-4.9811, -0.4352, -4.9811] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0.0189, -0.4352, -4.9811] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [5.0189, -0.4352, -4.9811] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [4.9196, -1.0858, 2.4914] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [4.8066, -1.5099, 7.4746] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-0.1934, -1.5099, 7.4746] - }, - "lerp_mode": "catmullrom" - }, - "0.5833": { - "post": { - "vector": [-5.1934, -1.5099, 7.4746] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [-5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "post": { - "vector": [0, -13.1, -4] - }, - "lerp_mode": "catmullrom" - }, - "0.0833": { - "post": { - "vector": [6, -15.47, -4] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [6, -13.8, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [4, -11.81, 8] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, -12.1, 8] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [-6, -14.96, 4] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-6, -14.55, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5833": { - "post": { - "vector": [-6, -12.99, -6] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, -13.1, -4] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [-7.1226, -29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-36.5714, -35.9552, 34.1778] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [-23.5556, -44.8303, 14.2689] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [5.1528, -57.991, 18.9213] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [-7.1226, -29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, 22.5] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, 57.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, 35] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, -30] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, -42.5] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, 22.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftEye": { - "rotation": { - "0.0": { - "post": { - "vector": [-25, -25, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftGrip": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -30, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 30, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, -30, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 30, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, -30, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightAntenna": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 70, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 50, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 70, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 50, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 70, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightArm": { - "rotation": { - "0.0": { - "post": { - "vector": [35, 17.5, -5] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [-5.3498, 1.8604, -13.9961] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [35, 17.5, -5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightElbow": { - "rotation": { - "0.0": { - "post": { - "vector": [5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-1.25, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [-62.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-52.19, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightClaw": { - "rotation": { - "0.0": { - "post": { - "vector": [-5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [50, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [55, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [1.87, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [-5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftAntenna": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -70, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, -50, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, -70, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, -50, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, -70, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftArm": { - "rotation": { - "0.0": { - "post": { - "vector": [-5.3498, -1.8604, 13.9961] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [35, -17.5, 5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [-5.3498, -1.8604, 13.9961] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftElbow": { - "rotation": { - "0.0": { - "post": { - "vector": [-62.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-52.19, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-1.25, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [-62.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftClaw": { - "rotation": { - "0.0": { - "post": { - "vector": [55, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [1.87, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [-5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [50, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [55, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [5.1528, 57.991, -18.9213] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-7.1226, 29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [-36.5714, 35.9552, -34.1778] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-23.5556, 44.8303, -14.2689] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [5.1528, 57.991, -18.9213] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, -22.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, -57.5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, -35] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 30] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, 42.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, -22.5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [-14.7966, 19.965, -19.6746] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-12.2252, 29.0774, -13.585] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [13.6745, -58.6061, -23.203] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0.9, -25.37, -22.42] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [-14.7966, 19.965, -19.6746] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -57.5] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, -22.5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, -57.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 30] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, -35] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, 30] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -22.5] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 42.5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, -22.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [12.5, 0, 0] - }, - "0.25": { - "vector": [0, 0, 0] - }, - "0.3333": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [12.5, 0, 0] - }, - "0.5833": { - "vector": [0, 0, 0] - } - } - } - } - }, - "spit": { - "animation_length": 1, - "bones": { - "body": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-25, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [2.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [2.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [0, 1, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [0, 0, -1] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [7.1226, 29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [7.1226, 29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [7.1226, 29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backRightFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightEye": { - "rotation": { - "0.0": { - "post": { - "vector": [-25, 25, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [-25, 25, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-25, 25, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "0.1667": { - "vector": [1, 1, 1] - }, - "0.25": { - "vector": [1, 0.3, 1] - }, - "0.4583": { - "vector": [1, 1, 1] - }, - "1.0": { - "vector": [1, 1, 1] - } - } - }, - "rightGrip": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -10, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [0, 25, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [0, -20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, -20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, -10, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, -10, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "root": { - "position": { - "0.0": { - "post": { - "vector": [0, -11.5, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, -11.5, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, -11.5, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [-7.1226, -29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [-13.01658, -61.28435, 22.32925] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [-7.1226, -29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-7.1226, -29.2189, 14.3589] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 9, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - } - }, - "frontRightKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [0, 0, 55] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [0, 0, -35] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontRightFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [0, 0, -5] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, -32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftEye": { - "rotation": { - "0.0": { - "post": { - "vector": [-25, -25, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-25, -25, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [-25, -25, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-25, -25, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "scale": { - "0.25": { - "vector": [1, 0.3, 1] - }, - "0.4583": { - "vector": [1, 1, 1] - } - } - }, - "leftGrip": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 10, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [0, -25, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [0, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 10, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 10, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightAntenna": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 60, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 60, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 60, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightArm": { - "rotation": { - "0.0": { - "post": { - "vector": [5, 17.5, -5] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-25.3744, -0.9366, -25.6212] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [41.8878, 17.5, -5] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [5, 17.5, -5] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [5, 17.5, -5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightElbow": { - "rotation": { - "0.0": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-60, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [32.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "rightClaw": { - "rotation": { - "0.0": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [59.72, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [0, 0, 5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, -1] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftAntenna": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -60, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, -60, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, -60, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftArm": { - "rotation": { - "0.0": { - "post": { - "vector": [5, -17.5, 5] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-25.3744, 0.9366, 25.6212] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [41.8878, -17.5, 5] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [5, -17.5, 5] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [5, -17.5, 5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftElbow": { - "rotation": { - "0.0": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-60, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [32.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "leftClaw": { - "rotation": { - "0.0": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [59.72, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [0, 0, 5] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, -1] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [-7.1226, 29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [-13.01658, 61.28435, -22.32925] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [-7.1226, 29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-7.1226, 29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 9, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - } - }, - "frontLeftKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [0, 0, -55] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [0, 0, 35] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "frontLeftFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [0, 0, 5] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftThigh": { - "rotation": { - "0.0": { - "post": { - "vector": [7.1226, -29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [7.1226, -29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [7.1226, -29.2189, -14.3589] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftKnee": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftLeg": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, -10] - }, - "lerp_mode": "catmullrom" - } - } - }, - "backLeftFoot": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "0.9167": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 32.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-11.86, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - } - } - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/antarchy/antarchy_logo.png b/common/src/main/resources/assets/antarchy/antarchy_logo.png index 8d16480f..d26b97b1 100644 Binary files a/common/src/main/resources/assets/antarchy/antarchy_logo.png and b/common/src/main/resources/assets/antarchy/antarchy_logo.png differ diff --git a/common/src/main/resources/assets/antarchy/blockstates/amber_lichen.json b/common/src/main/resources/assets/antarchy/blockstates/amber_lichen.json deleted file mode 100644 index c265ce00..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/amber_lichen.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "antarchy:block/amber_lichen" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen" - }, - "when": { - "down": "false", - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "y": 90 - }, - "when": { - "down": "false", - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "y": 180 - }, - "when": { - "down": "false", - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "y": 270 - }, - "when": { - "down": "false", - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "x": 270 - }, - "when": { - "down": "false", - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "antarchy:block/amber_lichen", - "uvlock": true, - "x": 90 - }, - "when": { - "down": "false", - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - } - ] -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/amber_moss_block.json b/common/src/main/resources/assets/antarchy/blockstates/amber_moss_block.json deleted file mode 100644 index 7e867f05..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/amber_moss_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "antarchy:block/amber_moss_block" - } - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/amber_moss_carpet.json b/common/src/main/resources/assets/antarchy/blockstates/amber_moss_carpet.json deleted file mode 100644 index e059b29b..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/amber_moss_carpet.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "antarchy:block/amber_moss_carpet" - }, - "when": { - "bottom": "true" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet" - }, - "when": { - "bottom": "false", - "east": "none", - "north": "none", - "south": "none", - "west": "none" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_tall" - }, - "when": { - "north": "tall" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_small" - }, - "when": { - "north": "low" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_tall" - }, - "when": { - "bottom": "false", - "east": "none", - "north": "none", - "south": "none", - "west": "none" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_tall", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "tall" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_small", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "low" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_tall", - "uvlock": true, - "y": 90 - }, - "when": { - "bottom": "false", - "east": "none", - "north": "none", - "south": "none", - "west": "none" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_tall", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "tall" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_small", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "low" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_tall", - "uvlock": true, - "y": 180 - }, - "when": { - "bottom": "false", - "east": "none", - "north": "none", - "south": "none", - "west": "none" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_tall", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "tall" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_small", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "low" - } - }, - { - "apply": { - "model": "antarchy:block/amber_moss_carpet_side_tall", - "uvlock": true, - "y": 270 - }, - "when": { - "bottom": "false", - "east": "none", - "north": "none", - "south": "none", - "west": "none" - } - } - ] -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/bile_vein.json b/common/src/main/resources/assets/antarchy/blockstates/bile_vein.json deleted file mode 100644 index 1ab1a4b4..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/bile_vein.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "antarchy:block/bile_vein" - } - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/broodstone.json b/common/src/main/resources/assets/antarchy/blockstates/broodstone.json deleted file mode 100644 index 4ae6f1c1..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/broodstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "antarchy:block/broodstone" - } - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/cavaryn_portal.json b/common/src/main/resources/assets/antarchy/blockstates/cavaryn_portal.json deleted file mode 100644 index 2dd199fb..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/cavaryn_portal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "axis=x": { "model": "antarchy:block/cavaryn_portal_x" }, - "axis=z": { "model": "antarchy:block/cavaryn_portal_z" } - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/chiten_block.json b/common/src/main/resources/assets/antarchy/blockstates/chiten_block.json deleted file mode 100644 index 651df798..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/chiten_block.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "antarchy:block/chiten_block", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "antarchy:block/chiten_block" - }, - "axis=z": { - "model": "antarchy:block/chiten_block", - "x": 90 - } - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/chiten_spike.json b/common/src/main/resources/assets/antarchy/blockstates/chiten_spike.json deleted file mode 100644 index 4cef7a2b..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/chiten_spike.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "thickness=base,vertical_direction=down": { "model": "antarchy:block/chiten_spike_down_base" }, - "thickness=base,vertical_direction=up": { "model": "antarchy:block/chiten_spike_up_base" }, - "thickness=frustum,vertical_direction=down": { "model": "antarchy:block/chiten_spike_down_frustum" }, - "thickness=frustum,vertical_direction=up": { "model": "antarchy:block/chiten_spike_up_frustum" }, - "thickness=middle,vertical_direction=down": { "model": "antarchy:block/chiten_spike_down_middle" }, - "thickness=middle,vertical_direction=up": { "model": "antarchy:block/chiten_spike_up_middle" }, - "thickness=tip,vertical_direction=down": { "model": "antarchy:block/chiten_spike_down_tip" }, - "thickness=tip,vertical_direction=up": { "model": "antarchy:block/chiten_spike_up_tip" }, - "thickness=tip_merge,vertical_direction=down": { "model": "antarchy:block/chiten_spike_down_tip_merge" }, - "thickness=tip_merge,vertical_direction=up": { "model": "antarchy:block/chiten_spike_up_tip_merge" } - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/creeping_horror_egg.json b/common/src/main/resources/assets/antarchy/blockstates/creeping_horror_egg.json deleted file mode 100644 index 8611d9f0..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/creeping_horror_egg.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "eggs=1,hatch=0": [ - { "model": "antarchy:block/creeping_horror_egg_1" }, - { "model": "antarchy:block/creeping_horror_egg_1", "y": 90 }, - { "model": "antarchy:block/creeping_horror_egg_1", "y": 180 }, - { "model": "antarchy:block/creeping_horror_egg_1", "y": 270 } - ], - "eggs=1,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_1" }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_1", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_1", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_1", "y": 270 } - ], - "eggs=1,hatch=2": [ - { "model": "antarchy:block/very_cracked_creeping_horror_egg_1" }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_1", "y": 90 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_1", "y": 180 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_1", "y": 270 } - ], - "eggs=2,hatch=0": [ - { "model": "antarchy:block/creeping_horror_egg_2" }, - { "model": "antarchy:block/creeping_horror_egg_2", "y": 90 }, - { "model": "antarchy:block/creeping_horror_egg_2", "y": 180 }, - { "model": "antarchy:block/creeping_horror_egg_2", "y": 270 } - ], - "eggs=2,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_2" }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_2", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_2", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_2", "y": 270 } - ], - "eggs=2,hatch=2": [ - { "model": "antarchy:block/very_cracked_creeping_horror_egg_2" }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_2", "y": 90 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_2", "y": 180 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_2", "y": 270 } - ], - "eggs=3,hatch=0": [ - { "model": "antarchy:block/creeping_horror_egg_3" }, - { "model": "antarchy:block/creeping_horror_egg_3", "y": 90 }, - { "model": "antarchy:block/creeping_horror_egg_3", "y": 180 }, - { "model": "antarchy:block/creeping_horror_egg_3", "y": 270 } - ], - "eggs=3,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_3" }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_3", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_3", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_3", "y": 270 } - ], - "eggs=3,hatch=2": [ - { "model": "antarchy:block/very_cracked_creeping_horror_egg_3" }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_3", "y": 90 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_3", "y": 180 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_3", "y": 270 } - ], - "eggs=4,hatch=0": [ - { "model": "antarchy:block/creeping_horror_egg_4" }, - { "model": "antarchy:block/creeping_horror_egg_4", "y": 90 }, - { "model": "antarchy:block/creeping_horror_egg_4", "y": 180 }, - { "model": "antarchy:block/creeping_horror_egg_4", "y": 270 } - ], - "eggs=4,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_4" }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_4", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_4", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_4", "y": 270 } - ], - "eggs=4,hatch=2": [ - { "model": "antarchy:block/very_cracked_creeping_horror_egg_4" }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_4", "y": 90 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_4", "y": 180 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_4", "y": 270 } - ] - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/creepvine.json b/common/src/main/resources/assets/antarchy/blockstates/creepvine.json deleted file mode 100644 index 630f81c1..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/creepvine.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "antarchy:block/creepvine" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine" - }, - "when": { - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine", - "uvlock": true, - "y": 180 - }, - "when": { - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine", - "uvlock": true, - "y": 270 - }, - "when": { - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine", - "uvlock": true, - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "antarchy:block/creepvine", - "uvlock": true, - "x": 270 - }, - "when": { - "east": "false", - "north": "false", - "south": "false", - "up": "false", - "west": "false" - } - } - ] -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/lurking_terror_egg.json b/common/src/main/resources/assets/antarchy/blockstates/lurking_terror_egg.json deleted file mode 100644 index dce79841..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/lurking_terror_egg.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "eggs=1,hatch=0": [ - { "model": "antarchy:block/lurking_terror_egg_1" }, - { "model": "antarchy:block/lurking_terror_egg_1", "y": 90 }, - { "model": "antarchy:block/lurking_terror_egg_1", "y": 180 }, - { "model": "antarchy:block/lurking_terror_egg_1", "y": 270 } - ], - "eggs=1,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_1" }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_1", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_1", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_1", "y": 270 } - ], - "eggs=1,hatch=2": [ - { "model": "antarchy:block/very_cracked_lurking_terror_egg_1" }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_1", "y": 90 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_1", "y": 180 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_1", "y": 270 } - ], - "eggs=2,hatch=0": [ - { "model": "antarchy:block/lurking_terror_egg_2" }, - { "model": "antarchy:block/lurking_terror_egg_2", "y": 90 }, - { "model": "antarchy:block/lurking_terror_egg_2", "y": 180 }, - { "model": "antarchy:block/lurking_terror_egg_2", "y": 270 } - ], - "eggs=2,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_2" }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_2", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_2", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_2", "y": 270 } - ], - "eggs=2,hatch=2": [ - { "model": "antarchy:block/very_cracked_lurking_terror_egg_2" }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_2", "y": 90 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_2", "y": 180 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_2", "y": 270 } - ], - "eggs=3,hatch=0": [ - { "model": "antarchy:block/lurking_terror_egg_3" }, - { "model": "antarchy:block/lurking_terror_egg_3", "y": 90 }, - { "model": "antarchy:block/lurking_terror_egg_3", "y": 180 }, - { "model": "antarchy:block/lurking_terror_egg_3", "y": 270 } - ], - "eggs=3,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_3" }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_3", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_3", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_3", "y": 270 } - ], - "eggs=3,hatch=2": [ - { "model": "antarchy:block/very_cracked_lurking_terror_egg_3" }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_3", "y": 90 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_3", "y": 180 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_3", "y": 270 } - ], - "eggs=4,hatch=0": [ - { "model": "antarchy:block/lurking_terror_egg_4" }, - { "model": "antarchy:block/lurking_terror_egg_4", "y": 90 }, - { "model": "antarchy:block/lurking_terror_egg_4", "y": 180 }, - { "model": "antarchy:block/lurking_terror_egg_4", "y": 270 } - ], - "eggs=4,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_4" }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_4", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_4", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_4", "y": 270 } - ], - "eggs=4,hatch=2": [ - { "model": "antarchy:block/very_cracked_lurking_terror_egg_4" }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_4", "y": 90 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_4", "y": 180 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_4", "y": 270 } - ] - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/myrmite.json b/common/src/main/resources/assets/antarchy/blockstates/myrmite.json deleted file mode 100644 index 55bfe4a1..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/myrmite.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "antarchy:block/myrmite" - } - } -} diff --git a/common/src/main/resources/assets/antarchy/blockstates/termite_nest.json b/common/src/main/resources/assets/antarchy/blockstates/termite_nest.json deleted file mode 100644 index 016df757..00000000 --- a/common/src/main/resources/assets/antarchy/blockstates/termite_nest.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": {"model": "antarchy:block/termite_nest"}, - "facing=east": {"model": "antarchy:block/termite_nest", "y": 90}, - "facing=south": {"model": "antarchy:block/termite_nest", "y": 180}, - "facing=west": {"model": "antarchy:block/termite_nest", "y": 270} - } -} diff --git a/common/src/main/resources/assets/antarchy/geo/glimmer.geo.json b/common/src/main/resources/assets/antarchy/geo/glimmer.geo.json new file mode 100644 index 00000000..2ac10f7c --- /dev/null +++ b/common/src/main/resources/assets/antarchy/geo/glimmer.geo.json @@ -0,0 +1,104 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.unknown", + "texture_width": 128, + "texture_height": 128, + "visible_bounds_width": 4, + "visible_bounds_height": 4.5, + "visible_bounds_offset": [0, 1.75, 0] + }, + "bones": [ + { + "name": "Glimmer", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "Glimmer", + "pivot": [0, 22.2, 0] + }, + { + "name": "right_leg", + "parent": "body", + "pivot": [-5, 18.5, -8], + "cubes": [ + {"origin": [-7.5, 0, -11.5], "size": [5, 19, 7], "uv": [36, 66]} + ] + }, + { + "name": "left_leg", + "parent": "body", + "pivot": [5, 18.5, -8], + "cubes": [ + {"origin": [2.5, 0, -11.5], "size": [5, 19, 7], "uv": [36, 66], "mirror": true} + ] + }, + { + "name": "back_right_leg", + "parent": "body", + "pivot": [-5, 18.5, 8], + "cubes": [ + {"origin": [-7.5, 0, 4.5], "size": [5, 19, 7], "uv": [36, 66]} + ] + }, + { + "name": "back_left_leg", + "parent": "body", + "pivot": [5, 18.5, 8], + "cubes": [ + {"origin": [2.5, 0, 4.5], "size": [5, 19, 7], "uv": [36, 66], "mirror": true} + ] + }, + { + "name": "torso", + "parent": "body", + "pivot": [0, 19, 0], + "cubes": [ + {"origin": [-6.5, 12, -12], "size": [13, 14, 24], "uv": [0, 0]}, + {"origin": [-5.5, 15, 12], "size": [11, 16, 7], "pivot": [0, 23, 14.5], "rotation": [7.5, 0, 0], "uv": [0, 80]} + ] + }, + { + "name": "neck", + "parent": "torso", + "pivot": [0, 20.5, -11.5], + "cubes": [ + {"origin": [-4.5, 14, -16], "size": [9, 19, 7], "uv": [0, 38]} + ] + }, + { + "name": "head", + "parent": "neck", + "pivot": [0, 33, -12.5], + "cubes": [ + {"origin": [-4.5, 33, -17], "size": [9, 9, 9], "inflate": 0.1, "uv": [32, 38]}, + {"origin": [-18.5, 41, -12], "size": [18, 14, 0], "uv": [0, 66]}, + {"origin": [0.5, 41, -12], "size": [18, 14, 0], "uv": [0, 66], "mirror": true}, + {"origin": [-3.5, 33, -22], "size": [7, 5, 5], "uv": [32, 56]} + ] + }, + { + "name": "right_ear", + "parent": "head", + "pivot": [-4.5, 41.25, -13], + "cubes": [ + {"origin": [-9.5, 40, -13], "size": [5, 4, 0], "uv": [25, 38]}, + {"origin": [-9.5, 40, -12.975], "size": [5, 4, 0], "uv": [0, 20]} + ] + }, + { + "name": "left_ear", + "parent": "head", + "pivot": [4.5, 41.25, -13], + "cubes": [ + {"origin": [4.5, 40, -12.975], "size": [5, 4, 0], "uv": [0, 20], "mirror": true}, + {"origin": [4.5, 40, -13], "size": [5, 4, 0], "uv": [25, 38], "mirror": true} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/antarchy/geo/glimmer_baby.geo.json b/common/src/main/resources/assets/antarchy/geo/glimmer_baby.geo.json new file mode 100644 index 00000000..fa42bb28 --- /dev/null +++ b/common/src/main/resources/assets/antarchy/geo/glimmer_baby.geo.json @@ -0,0 +1,102 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.unknown", + "texture_width": 128, + "texture_height": 128, + "visible_bounds_width": 4, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "Glimmer", + "pivot": [0, 16.2, 3] + }, + { + "name": "body", + "parent": "Glimmer", + "pivot": [0, 16.2, 3] + }, + { + "name": "right_leg", + "parent": "body", + "pivot": [-4, 12.5, -5], + "cubes": [ + {"origin": [-5.5, 0, -8.5], "size": [4, 13, 5], "uv": [0, 25]} + ] + }, + { + "name": "left_leg", + "parent": "body", + "pivot": [4, 12.5, -5], + "cubes": [ + {"origin": [1.5, 0, -8.5], "size": [4, 13, 5], "uv": [0, 25], "mirror": true} + ] + }, + { + "name": "back_right_leg", + "parent": "body", + "pivot": [-5, 12.5, 6], + "cubes": [ + {"origin": [-6.5, 0, 3.5], "size": [4, 13, 5], "uv": [0, 25]} + ] + }, + { + "name": "back_left_leg", + "parent": "body", + "pivot": [5, 12.5, 6], + "cubes": [ + {"origin": [2.5, 0, 3.5], "size": [4, 13, 5], "uv": [0, 25], "mirror": true} + ] + }, + { + "name": "torso", + "parent": "body", + "pivot": [0, 13, 3], + "cubes": [ + {"origin": [-5, 7, -8], "size": [10, 10, 17], "uv": [58, 0]}, + {"origin": [-5.5, 9, 8], "size": [11, 16, 7], "pivot": [0, 17, 17.5], "rotation": [7.5, 0, 0], "uv": [18, 21]} + ] + }, + { + "name": "neck", + "parent": "torso", + "pivot": [0, 14.5, -8.5], + "cubes": [ + {"origin": [-3.5, 8, -13], "size": [7, 14, 7], "uv": [30, 0]} + ] + }, + { + "name": "head", + "parent": "neck", + "pivot": [0, 21, -9.5], + "cubes": [ + {"origin": [-3.5, 21, -14], "size": [7, 8, 8], "inflate": 0.1, "uv": [0, 0]}, + {"origin": [-2.5, 21, -19], "size": [5, 4, 5], "uv": [0, 16]} + ] + }, + { + "name": "right_ear", + "parent": "head", + "pivot": [-3.5, 27.25, -10], + "cubes": [ + {"origin": [-7.5, 26, -10], "size": [4, 4, 0], "uv": [53, 0]} + ] + }, + { + "name": "left_ear", + "parent": "head", + "pivot": [3.5, 27.25, -10], + "cubes": [ + {"origin": [3.5, 26, -10], "size": [4, 4, 0], "uv": [53, 0], "mirror": true}, + {"origin": [3.5, 26, -9.975], "size": [4, 4, 0], "uv": [61, 0], "mirror": true}, + {"origin": [-7.5, 26, -9.975], "size": [4, 4, 0], "uv": [61, 0]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/antarchy/geo/spit_bug.geo.json b/common/src/main/resources/assets/antarchy/geo/spit_bug.geo.json deleted file mode 100644 index ee5d6389..00000000 --- a/common/src/main/resources/assets/antarchy/geo/spit_bug.geo.json +++ /dev/null @@ -1,231 +0,0 @@ -{ - "format_version": "1.12.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.spitbug", - "texture_width": 256, - "texture_height": 256, - "visible_bounds_width": 6, - "visible_bounds_height": 5.5, - "visible_bounds_offset": [0, 2.25, 0] - }, - "bones": [ - { - "name": "root", - "pivot": [0, 0, 0] - }, - { - "name": "body", - "parent": "root", - "pivot": [0, 36, 0], - "cubes": [ - {"origin": [-11.5, 36, -18], "size": [23, 18, 37], "inflate": -0.05, "uv": [0, 103]}, - {"origin": [-9.5, 54, -35], "size": [19, 7, 59], "uv": [0, 0]}, - {"origin": [-7.5, 54, -52], "size": [15, 7, 17], "uv": [112, 28]}, - {"origin": [-6.5, 42, -51.75], "size": [3, 12, 5], "uv": [34, 23]}, - {"origin": [3.5, 42, -51.75], "size": [3, 12, 5], "uv": [34, 23], "mirror": true}, - {"origin": [-7.5, 52, -52], "size": [15, 2, 0], "uv": [0, 24]}, - {"origin": [-7.5, 44, -52], "size": [0, 10, 17], "uv": [5, 29]}, - {"origin": [-9.5, 47, -35], "size": [2, 7, 0], "uv": [37, 16]}, - {"origin": [-9.5, 45, -35], "size": [0, 9, 17], "uv": [0, 18]}, - {"origin": [9.5, 45, -35], "size": [0, 9, 17], "uv": [0, 18], "mirror": true}, - {"origin": [7.5, 47, -35], "size": [2, 7, 0], "uv": [37, 16], "mirror": true}, - {"origin": [7.5, 44, -52], "size": [0, 10, 17], "uv": [5, 29], "mirror": true}, - {"origin": [-11.5, 32.1, -18], "size": [23, 4, 33], "inflate": -0.05, "uv": [0, 66]} - ] - }, - { - "name": "jaw", - "parent": "body", - "pivot": [-3.07143, 33.92857, -16], - "cubes": [ - {"origin": [-8.5, 32, -51], "size": [17, 2, 18], "uv": [97, 0]}, - {"origin": [-11.5, 30, -33], "size": [23, 4, 17], "uv": [79, 66]}, - {"origin": [-11.5, 34, -33], "size": [0, 8, 17], "uv": [0, -17]}, - {"origin": [-11.5, 34, -33], "size": [3, 8, 0], "uv": [0, 8]}, - {"origin": [8.5, 34, -33], "size": [3, 8, 0], "uv": [0, 8], "mirror": true}, - {"origin": [11.5, 34, -33], "size": [0, 8, 17], "uv": [0, -17], "mirror": true}, - {"origin": [-8.5, 34, -51], "size": [0, 8, 18], "uv": [0, -2]}, - {"origin": [-4.5, 32.5, -52.575], "size": [3, 8, 4], "pivot": [-3, 36.5, -50.575], "rotation": [22.5, 0, 0], "uv": [35, 0]}, - {"origin": [1.5, 32.5, -52.575], "size": [3, 8, 4], "pivot": [3, 36.5, -50.575], "rotation": [22.5, 0, 0], "uv": [35, 0], "mirror": true}, - {"origin": [-8.5, 34, -51], "size": [17, 8, 0], "uv": [0, 26]}, - {"origin": [8.5, 34, -51], "size": [0, 8, 18], "uv": [0, -2], "mirror": true} - ] - }, - { - "name": "rightEye", - "parent": "body", - "pivot": [-11, 45.5, -17], - "cubes": [ - {"origin": [-12, 45.5, -19], "size": [3, 3, 3], "uv": [83, 114]} - ] - }, - { - "name": "leftEye", - "parent": "body", - "pivot": [11, 45.5, -17], - "cubes": [ - {"origin": [9, 45.5, -19], "size": [3, 3, 3], "uv": [83, 114], "mirror": true} - ] - }, - { - "name": "rightGrip", - "parent": "body", - "pivot": [-11.5, 54, -16], - "rotation": [0, 0, 90] - }, - { - "name": "leftGrip", - "parent": "body", - "pivot": [11.5, 54, -16], - "rotation": [0, 0, -90] - }, - { - "name": "backRightThigh", - "parent": "root", - "pivot": [-11.5, 37, 10], - "cubes": [ - {"origin": [-20.5, 33, 8], "size": [9, 4, 4], "uv": [83, 120]} - ] - }, - { - "name": "backRightKnee", - "parent": "backRightThigh", - "pivot": [-20.5, 37, 10], - "rotation": [0, 0, -90], - "cubes": [ - {"origin": [-34.5, 32, 7], "size": [14, 5, 6], "inflate": 0.025, "uv": [83, 103]} - ] - }, - { - "name": "backRightLeg", - "parent": "backRightKnee", - "pivot": [-34.5, 32, 10], - "rotation": [0, 0, 90], - "cubes": [ - {"origin": [-53.5, 32, 8], "size": [19, 4, 4], "uv": [97, 20]} - ] - }, - { - "name": "backRightFoot", - "parent": "backRightLeg", - "pivot": [-53.5, 32, 10], - "rotation": [0, 0, -90], - "cubes": [ - {"origin": [-67.5, 30, 9], "size": [14, 2, 2], "inflate": 0.025, "uv": [97, 28]}, - {"origin": [-76.5, 30, 10], "size": [9, 2, 0], "uv": [97, 32]} - ] - }, - { - "name": "backLeftThigh", - "parent": "root", - "pivot": [11.5, 37, 10], - "cubes": [ - {"origin": [11.5, 33, 8], "size": [9, 4, 4], "uv": [83, 120]} - ] - }, - { - "name": "backLeftKnee", - "parent": "backLeftThigh", - "pivot": [20.5, 37, 10], - "rotation": [0, 0, 90], - "cubes": [ - {"origin": [20.5, 32, 7], "size": [14, 5, 6], "inflate": 0.025, "uv": [83, 103]} - ] - }, - { - "name": "backLeftLeg", - "parent": "backLeftKnee", - "pivot": [34.5, 32, 10], - "rotation": [0, 0, -90], - "cubes": [ - {"origin": [34.5, 32, 8], "size": [19, 4, 4], "uv": [97, 20]} - ] - }, - { - "name": "backLeftFoot", - "parent": "backLeftLeg", - "pivot": [53.5, 32, 10], - "rotation": [0, 0, 90], - "cubes": [ - {"origin": [53.5, 30, 9], "size": [14, 2, 2], "inflate": 0.025, "uv": [97, 28]}, - {"origin": [67.5, 30, 10], "size": [9, 2, 0], "uv": [97, 32], "mirror": true} - ] - }, - { - "name": "frontRightThigh", - "parent": "root", - "pivot": [-11.5, 37, -10], - "cubes": [ - {"origin": [-20.5, 33, -12], "size": [9, 4, 4], "uv": [83, 120]} - ] - }, - { - "name": "frontRightKnee", - "parent": "frontRightThigh", - "pivot": [-20.5, 37, -10], - "rotation": [0, 0, -90], - "cubes": [ - {"origin": [-34.5, 32, -13], "size": [14, 5, 6], "inflate": 0.025, "uv": [83, 103]} - ] - }, - { - "name": "frontRightLeg", - "parent": "frontRightKnee", - "pivot": [-34.5, 32, -10], - "rotation": [0, 0, 90], - "cubes": [ - {"origin": [-53.5, 32, -12], "size": [19, 4, 4], "uv": [97, 20]} - ] - }, - { - "name": "frontRightFoot", - "parent": "frontRightLeg", - "pivot": [-53.5, 32, -10], - "rotation": [0, 0, -90], - "cubes": [ - {"origin": [-67.5, 30, -11], "size": [14, 2, 2], "inflate": 0.025, "uv": [97, 28]}, - {"origin": [-76.5, 30, -10], "size": [9, 2, 0], "uv": [97, 32]} - ] - }, - { - "name": "frontLeftThigh", - "parent": "root", - "pivot": [11.5, 37, -10], - "cubes": [ - {"origin": [11.5, 33, -12], "size": [9, 4, 4], "uv": [83, 120]} - ] - }, - { - "name": "frontLeftKnee", - "parent": "frontLeftThigh", - "pivot": [20.5, 37, -10], - "rotation": [0, 0, 90], - "cubes": [ - {"origin": [20.5, 32, -13], "size": [14, 5, 6], "inflate": 0.025, "uv": [83, 103]} - ] - }, - { - "name": "frontLeftLeg", - "parent": "frontLeftKnee", - "pivot": [34.5, 32, -10], - "rotation": [0, 0, -90], - "cubes": [ - {"origin": [34.5, 32, -12], "size": [19, 4, 4], "uv": [97, 20]} - ] - }, - { - "name": "frontLeftFoot", - "parent": "frontLeftLeg", - "pivot": [53.5, 32, -10], - "rotation": [0, 0, 90], - "cubes": [ - {"origin": [53.5, 30, -11], "size": [14, 2, 2], "inflate": 0.025, "uv": [97, 28]}, - {"origin": [67.5, 30, -10], "size": [9, 2, 0], "uv": [97, 32], "mirror": true} - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/antarchy/lang/en_us.json b/common/src/main/resources/assets/antarchy/lang/en_us.json index 2a915733..c1c25ffe 100644 --- a/common/src/main/resources/assets/antarchy/lang/en_us.json +++ b/common/src/main/resources/assets/antarchy/lang/en_us.json @@ -1,833 +1,744 @@ { - "block.antarchy.duplicator_log": "Duplicator Log", - "block.antarchy.ouranwood_log": "Ouranwood Log", - "block.antarchy.ouranwood_wood": "Ouranwood Wood", - "block.antarchy.mossy_ouranwood_log": "Mossy Ouranwood Log", - "block.antarchy.mossy_ouranwood_wood": "Mossy Ouranwood Wood", - "block.antarchy.stripped_ouranwood_log": "Stripped Ouranwood Log", - "block.antarchy.stripped_ouranwood_wood": "Stripped Ouranwood Wood", - "block.antarchy.ouranwood_planks": "Ouranwood Planks", - "block.antarchy.ouranwood_stairs": "Ouranwood Stairs", - "block.antarchy.ouranwood_slab": "Ouranwood Slab", - "block.antarchy.ouranwood_fence": "Ouranwood Fence", - "block.antarchy.ouranwood_fence_gate": "Ouranwood Fence Gate", - "block.antarchy.ouranwood_door": "Ouranwood Door", - "block.antarchy.ouranwood_trapdoor": "Ouranwood Trapdoor", - "block.antarchy.ouranwood_pressure_plate": "Ouranwood Pressure Plate", - "block.antarchy.ouranwood_button": "Ouranwood Button", - "block.antarchy.ouranwood_leaves": "Ouranwood Leaves", - "block.antarchy.ouranwood_acorn": "Ouranwood Acorn", - "block.antarchy.ouranwood_vine": "Ouranwood Vine", - "block.antarchy.ouranwood_sign": "Ouranwood Sign", - "block.antarchy.ouranwood_hanging_sign": "Ouranwood Hanging Sign", - "block.antarchy.orange_milkweed": "Orange Milkweed", - "block.antarchy.pink_milkweed": "Pink Milkweed", - "block.antarchy.hushweed": "Hushweed", - "block.antarchy.big_bush": "Big Bush", - "block.antarchy.big_bush_part": "Big Bush", - "block.antarchy.very_short_grass": "Very Short Grass", - "block.antarchy.very_tall_grass": "Very Tall Grass", - "block.antarchy.umbral_moss_block": "Umbral Moss Block", - "block.antarchy.umbral_moss_carpet": "Umbral Moss Carpet", - "block.antarchy.amber_moss_block": "Amber Moss Block", - "block.antarchy.amber_moss_carpet": "Amber Moss Carpet", - "block.antarchy.amber_lichen": "Amber Lichen", - "block.antarchy.bile_vein": "Bile Vein", - "block.antarchy.duplicator_sapling": "Duplicator Sapling", - "block.antarchy.creepvine": "Creepvine", - "block.antarchy.duct_tape": "Duct Tape", - "block.antarchy.infested_rooted_dirt": "Infested Rooted Dirt", - "block.antarchy.infested_coarse_dirt": "Infested Coarse Dirt", - "block.antarchy.nyxite": "Nyxite", - "block.antarchy.myrmite": "Myrmite", - "block.antarchy.broodstone": "Broodstone", - "block.antarchy.polished_nyxite": "Polished Nyxite", - "block.antarchy.chiseled_nyxite": "Chiseled Nyxite", - "block.antarchy.nyxite_bricks": "Nyxite Bricks", - "block.antarchy.chiten_block": "Chiten Block", - "block.antarchy.chiten_spike": "Chiten Spike", - "block.antarchy.shellstone": "Shellstone", - "block.antarchy.polished_shellstone": "Polished Shellstone", - "block.antarchy.shellstone_bricks": "Shellstone Bricks", - "block.antarchy.chiseled_shellstone": "Chiseled Shellstone", - "block.antarchy.mossy_shellstone_bricks": "Mossy Shellstone Bricks", - "block.antarchy.mossy_shellstone_brick_stairs": "Mossy Shellstone Brick Stairs", - "block.antarchy.mossy_shellstone_brick_slab": "Mossy Shellstone Brick Slab", - "block.antarchy.mossy_shellstone_brick_wall": "Mossy Shellstone Brick Wall", - "block.antarchy.cracked_shellstone_bricks": "Cracked Shellstone Bricks", - "block.antarchy.shellstone_stairs": "Shellstone Stairs", - "block.antarchy.shellstone_slab": "Shellstone Slab", - "block.antarchy.shellstone_wall": "Shellstone Wall", - "block.antarchy.polished_shellstone_stairs": "Polished Shellstone Stairs", - "block.antarchy.polished_shellstone_slab": "Polished Shellstone Slab", - "block.antarchy.polished_shellstone_wall": "Polished Shellstone Wall", - "block.antarchy.shellstone_brick_stairs": "Shellstone Brick Stairs", - "block.antarchy.shellstone_brick_slab": "Shellstone Brick Slab", - "block.antarchy.shellstone_brick_wall": "Shellstone Brick Wall", - "block.antarchy.nyxite_stairs": "Nyxite Stairs", - "block.antarchy.nyxite_slab": "Nyxite Slab", - "block.antarchy.nyxite_wall": "Nyxite Wall", - "block.antarchy.polished_nyxite_stairs": "Polished Nyxite Stairs", - "block.antarchy.polished_nyxite_slab": "Polished Nyxite Slab", - "block.antarchy.polished_nyxite_wall": "Polished Nyxite Wall", - "block.antarchy.nyxite_brick_stairs": "Nyxite Brick Stairs", - "block.antarchy.nyxite_brick_slab": "Nyxite Brick Slab", - "block.antarchy.nyxite_brick_wall": "Nyxite Brick Wall", - "block.antarchy.pale_nyxite": "Pale Nyxite", - "block.antarchy.nyxite_spike": "Nyxite Spike", - "block.antarchy.potent_nyxite": "Potent Nyxite", - "block.antarchy.triffid_goo_block": "Triffid Goo Block", - "block.antarchy.elythia_portal": "Elythia Portal", - "block.antarchy.cloud_block": "Cloud Block", - "block.antarchy.thoraxis_portal": "Thoraxis Portal", - "block.antarchy.antimetal": "Antimetal", - "block.antarchy.polished_antimetal": "Polished Antimetal", - "block.antarchy.antimetal_scaffolding": "Antimetal Scaffolding", - "block.antarchy.cavaryn_portal": "Cavaryn Portal", - "block.antarchy.cornea_stalk": "Cornea Stalk", - "block.antarchy.dream_torch": "Dream Torch", - "block.antarchy.dream_wall_torch": "Dream Wall Torch", - "block.antarchy.dream_lantern": "Dream Lantern", - "block.antarchy.dream_campfire": "Dream Campfire", - "block.antarchy.dream_fire": "Dream Fire", - "block.antarchy.dream_fire_ceiling": "Dream Fire", - "block.antarchy.budding_blood_crystal": "Budding Blood Crystal", - "block.antarchy.blood_crystal_block": "Blood Crystal Block", - "block.antarchy.small_blood_crystal_bud": "Small Blood Crystal Bud", - "block.antarchy.medium_blood_crystal_bud": "Medium Blood Crystal Bud", - "block.antarchy.large_blood_crystal_bud": "Large Blood Crystal Bud", - "block.antarchy.blood_crystal_cluster": "Blood Crystal Cluster", - "block.antarchy.dream_sand": "Dream Sand", - "block.antarchy.dream_sandstone": "Dream Sandstone", - "block.antarchy.chiseled_dream_sandstone": "Chiseled Dream Sandstone", - "block.antarchy.cut_dream_sandstone": "Cut Dream Sandstone", - "block.antarchy.smooth_dream_sandstone": "Smooth Dream Sandstone", - "block.antarchy.dream_sandstone_stairs": "Dream Sandstone Stairs", - "block.antarchy.dream_sandstone_slab": "Dream Sandstone Slab", - "block.antarchy.dream_sandstone_wall": "Dream Sandstone Wall", - "block.antarchy.smooth_dream_sandstone_stairs": "Smooth Dream Sandstone Stairs", - "block.antarchy.smooth_dream_sandstone_slab": "Smooth Dream Sandstone Slab", - "block.antarchy.cut_dream_sandstone_slab": "Cut Dream Sandstone Slab", - "block.antarchy.bed_bug_egg": "Bed Bug Egg", - "block.antarchy.creeping_horror_egg": "Creeping Horror Egg", - "block.antarchy.lurking_terror_egg": "Lurking Terror Egg", - "block.antarchy.wasp_nest": "Wasp Nest", - "block.antarchy.red_ant_nest": "Red Ant Nest", - "block.antarchy.brown_ant_nest": "Brown Ant Nest", - "block.antarchy.rainbow_ant_nest": "Rainbow Ant Nest", - "block.antarchy.termite_nest": "Termite Nest", - "block.antarchy.uranium_ore": "Uranium Ore", - "block.antarchy.deepslate_uranium_ore": "Deepslate Uranium Ore", - "block.antarchy.titanium_ore": "Titanium Ore", - "block.antarchy.deepslate_titanium_ore": "Deepslate Titanium Ore", - "block.antarchy.uranium_block": "Block of Uranium", - "block.antarchy.titanium_block": "Block of Titanium", - "block.antarchy.raw_uranium_block": "Block of Raw Uranium", - "block.antarchy.raw_titanium_block": "Block of Raw Titanium", - "block.antarchy.cut_uranium": "Cut Uranium", - "block.antarchy.cut_titanium": "Cut Titanium", - "block.antarchy.cut_uranium_slab": "Cut Uranium Slab", - "block.antarchy.cut_titanium_slab": "Cut Titanium Slab", - "block.antarchy.cut_uranium_stairs": "Cut Uranium Stairs", - "block.antarchy.cut_titanium_stairs": "Cut Titanium Stairs", - "block.antarchy.chiseled_uranium": "Chiseled Uranium", - "block.antarchy.chiseled_titanium": "Chiseled Titanium", - "block.antarchy.uranium_bulb": "Uranium Bulb", - "block.antarchy.titanium_bulb": "Titanium Bulb", - "block.antarchy.uranium_door": "Uranium Door", - "block.antarchy.titanium_door": "Titanium Door", - "block.antarchy.uranium_trapdoor": "Uranium Trapdoor", - "block.antarchy.titanium_trapdoor": "Titanium Trapdoor", - "block.antarchy.uranium_bars": "Uranium Bars", - "block.antarchy.titanium_bars": "Titanium Bars", - "tooltip.antarchy.signal_saving_bulb": "Toggles on/off. Has light level equal to the signal strength stored on it.", - "block.antarchy.bile": "Bile", - "block.antarchy.ichor": "Ichor", - "block.antarchy.antiwater": "Antiwater", - "entity.antarchy.apple_cow": "Apple Cow", - "entity.antarchy.golden_apple_cow": "Golden Apple Cow", - "entity.antarchy.enchanted_golden_apple_cow": "Enchanted Golden Apple Cow", - "entity.antarchy.honeyed_apple_cow": "Honeyed Apple Cow", - "entity.antarchy.easter_bunny": "Easter Bunny", - "entity.antarchy.flying_squirrel": "Flying Squirrel", - "entity.antarchy.caterpillar": "Caterpillar", - "entity.antarchy.butterfly": "Butterfly", - "entity.antarchy.brutalfly": "Brutalfly", - "entity.antarchy.red_ant": "Red Ant", - "entity.antarchy.brown_ant": "Brown Ant", - "entity.antarchy.rainbow_ant": "Rainbow Ant", - "entity.antarchy.termite": "Termite", - "entity.antarchy.diamond_minecart": "The Diamond Minecart", - "entity.antarchy.dr_trayaurus": "Dr. Trayaurus", - "entity.antarchy.cloud_shark": "Cloud Shark", - "entity.antarchy.kraken": "The Kraken", - "entity.antarchy.missile_squid": "Missile Squid", - "entity.antarchy.octopus_bomb": "Octopus Bomb", - "entity.antarchy.nightmare": "Nightmare", - "entity.antarchy.bed_bug": "Bed Bug", - "entity.antarchy.stink_bug": "Stink Bug", - "entity.antarchy.jumpy_bug": "Jumpy Bug", - "entity.antarchy.spit_bug": "Spit Bug", - "entity.antarchy.wasp": "Wasp", - "entity.antarchy.bomber": "Bomber", - "entity.antarchy.moleworm": "Moleworm", - "entity.antarchy.molevore": "Molevore", - "entity.antarchy.mantis": "Mantis", - "entity.antarchy.alpha_mantis": "Alpha Mantis", - "entity.antarchy.triffid": "Triffid", - "entity.antarchy.toreterror": "Toreterror", - "entity.antarchy.water_bomb": "Water Bomb", - "entity.antarchy.creeping_horror": "Creeping Horror", - "entity.antarchy.lurking_terror": "Lurking Terror", - "subtitles.antarchy.mantis_ambient": "Mantis clicks", - "subtitles.antarchy.mantis_hurt": "Mantis screeches", - "subtitles.antarchy.mantis_attack": "Mantis snaps", - "subtitles.antarchy.mantis_fly_loop": "Mantis wings buzz", - "item.antarchy.big_bertha": "Big Bertha", - "item.antarchy.wasp_nest": "Wasp Nest", - "item.antarchy.stink_bug": "Stink Bug", - "item.antarchy.stink_bug_spawn_egg": "Stink Bug Spawn Egg", - "item.antarchy.wasp_spawn_egg": "Wasp Spawn Egg", - "item.antarchy.bomber_spawn_egg": "Bomber Spawn Egg", - "item.antarchy.jumpy_bug_spawn_egg": "Jumpy Bug Spawn Egg", - "item.antarchy.spit_bug_spawn_egg": "Spit Bug Spawn Egg", - "item.antarchy.big_bertha_blade": "Big Bertha Blade", - "item.antarchy.big_bertha_handle": "Big Bertha Handle", - "item.antarchy.big_bertha_hilt": "Big Bertha Hilt", - "item.antarchy.battle_axe": "Battle Axe", - "item.antarchy.cloud_shark_fin": "Cloud Shark Fin", - "item.antarchy.cloud_shark_fin_soup": "Cloud Shark Fin Soup", - "tooltip.antarchy.cloud_shark_fin_soup": "Grants Strength and Slow Falling.", - "item.antarchy.kraken_tooth": "Kraken Tooth", - "item.antarchy.basilisk_fang": "Basilisk Fang", - "item.antarchy.basilisk_dagger": "Basilisk Dagger", - "item.antarchy.blood_crystal_block": "Blood Crystal Block", - "item.antarchy.small_blood_crystal_bud": "Small Blood Crystal Bud", - "item.antarchy.medium_blood_crystal_bud": "Medium Blood Crystal Bud", - "item.antarchy.large_blood_crystal_bud": "Large Blood Crystal Bud", - "item.antarchy.blood_crystal_cluster": "Blood Crystal Cluster", - "item.antarchy.dream_sand": "Dream Sand", - "item.antarchy.dream_sandstone": "Dream Sandstone", - "item.antarchy.chiseled_dream_sandstone": "Chiseled Dream Sandstone", - "item.antarchy.cut_dream_sandstone": "Cut Dream Sandstone", - "item.antarchy.smooth_dream_sandstone": "Smooth Dream Sandstone", - "item.antarchy.dream_sandstone_stairs": "Dream Sandstone Stairs", - "item.antarchy.dream_sandstone_slab": "Dream Sandstone Slab", - "item.antarchy.dream_sandstone_wall": "Dream Sandstone Wall", - "item.antarchy.smooth_dream_sandstone_stairs": "Smooth Dream Sandstone Stairs", - "item.antarchy.smooth_dream_sandstone_slab": "Smooth Dream Sandstone Slab", - "item.antarchy.cut_dream_sandstone_slab": "Cut Dream Sandstone Slab", - "item.antarchy.dream_torch": "Dream Torch", - "item.antarchy.dream_lantern": "Dream Lantern", - "item.antarchy.dream_campfire": "Dream Campfire", - "item.antarchy.nightmare_scale": "Nightmare Scale", - "item.antarchy.nightmare_helmet": "Nightmare Helmet", - "item.antarchy.nightmare_chestplate": "Nightmare Chestplate", - "item.antarchy.nightmare_leggings": "Nightmare Leggings", - "item.antarchy.nightmare_boots": "Nightmare Boots", - "item.antarchy.nightmare_sword": "Nightmare Sword", - "tooltip.antarchy.nightmare_armor_double_damage": "%s%% chance to deal double damage", - "tooltip.antarchy.nightmare_armor_set_bonus": "Full Set: Wither & Dread immunity", - "tooltip.antarchy.nightmare_sword": "Deals more damage as your health drops.", - "tooltip.antarchy.nightmare_sword_damage": "Deals %s damage", - "tooltip.antarchy.primordial_helmet_water_breathing": "Grants the wearer Water Breathing", - "tooltip.antarchy.primordial_armor_knockback_dealt": "Adds %s attack knockback per piece", - "tooltip.antarchy.primordial_armor_set_bonus": "Full Set: Attacks ignore enemy knockback resistance", - "attribute.antarchy.double_damage_chance": "Double Damage Chance", - "attribute.antarchy.bloodglass_max_hearts": "Max Bloodglass Hearts", - "item.antarchy.molevore_nose": "Molevore Nose", - "item.antarchy.moleworm": "Moleworm", - "item.antarchy.triffid_spawn_egg": "Triffid Spawn Egg", - "item.antarchy.infested_rooted_dirt": "Infested Rooted Dirt", - "item.antarchy.infested_coarse_dirt": "Infested Coarse Dirt", - "item.antarchy.pale_nyxite": "Pale Nyxite", - "item.antarchy.polished_nyxite": "Polished Nyxite", - "item.antarchy.chiseled_nyxite": "Chiseled Nyxite", - "item.antarchy.nyxite_bricks": "Nyxite Bricks", - "item.antarchy.shellstone": "Shellstone", - "item.antarchy.polished_shellstone": "Polished Shellstone", - "item.antarchy.shellstone_bricks": "Shellstone Bricks", - "item.antarchy.chiseled_shellstone": "Chiseled Shellstone", - "item.antarchy.mossy_shellstone_bricks": "Mossy Shellstone Bricks", - "item.antarchy.mossy_shellstone_brick_stairs": "Mossy Shellstone Brick Stairs", - "item.antarchy.mossy_shellstone_brick_slab": "Mossy Shellstone Brick Slab", - "item.antarchy.mossy_shellstone_brick_wall": "Mossy Shellstone Brick Wall", - "item.antarchy.cracked_shellstone_bricks": "Cracked Shellstone Bricks", - "item.antarchy.shellstone_stairs": "Shellstone Stairs", - "item.antarchy.shellstone_slab": "Shellstone Slab", - "item.antarchy.shellstone_wall": "Shellstone Wall", - "item.antarchy.polished_shellstone_stairs": "Polished Shellstone Stairs", - "item.antarchy.polished_shellstone_slab": "Polished Shellstone Slab", - "item.antarchy.polished_shellstone_wall": "Polished Shellstone Wall", - "item.antarchy.shellstone_brick_stairs": "Shellstone Brick Stairs", - "item.antarchy.shellstone_brick_slab": "Shellstone Brick Slab", - "item.antarchy.shellstone_brick_wall": "Shellstone Brick Wall", - "item.antarchy.nyxite_stairs": "Nyxite Stairs", - "item.antarchy.nyxite_slab": "Nyxite Slab", - "item.antarchy.nyxite_wall": "Nyxite Wall", - "item.antarchy.polished_nyxite_stairs": "Polished Nyxite Stairs", - "item.antarchy.polished_nyxite_slab": "Polished Nyxite Slab", - "item.antarchy.polished_nyxite_wall": "Polished Nyxite Wall", - "item.antarchy.nyxite_brick_stairs": "Nyxite Brick Stairs", - "item.antarchy.nyxite_brick_slab": "Nyxite Brick Slab", - "item.antarchy.nyxite_brick_wall": "Nyxite Brick Wall", - "item.antarchy.potent_nyxite": "Potent Nyxite", - "item.antarchy.antimetal": "Antimetal", - "item.antarchy.polished_antimetal": "Polished Antimetal", - "item.antarchy.antimetal_scaffolding": "Antimetal Scaffolding", - "item.antarchy.ouranwood_acorn": "Ouranwood Acorn", - "item.antarchy.ouranwood_vine": "Ouranwood Vine", - "item.antarchy.ouranwood_boat": "Ouranwood Boat", - "item.antarchy.ouranwood_chest_boat": "Ouranwood Chest Boat", - "item.antarchy.big_bush": "Big Bush", - "item.antarchy.big_bush.tooltip": "Can be bonemealed", - "item.antarchy.very_short_grass": "Very Short Grass", - "item.antarchy.very_tall_grass": "Very Tall Grass", - "item.antarchy.orange_milkweed": "Orange Milkweed", - "item.antarchy.pink_milkweed": "Pink Milkweed", - "item.antarchy.hushweed": "Hushweed", - "item.antarchy.umbral_moss_block": "Umbral Moss Block", - "item.antarchy.umbral_moss_carpet": "Umbral Moss Carpet", - "item.antarchy.amber_moss_block": "Amber Moss Block", - "item.antarchy.amber_moss_carpet": "Amber Moss Carpet", - "item.antarchy.amber_lichen": "Amber Lichen", - "item.antarchy.bile_vein": "Bile Vein", - "item.antarchy.creepvine": "Creepvine", - "item.antarchy.chiten": "Chiten", - "item.antarchy.chiten_block": "Chiten Block", - "item.antarchy.chiten_spike": "Chiten Spike", - "item.antarchy.myrmite": "Myrmite", - "item.antarchy.broodstone": "Broodstone", - "item.antarchy.torchflower_bush": "Torchflower Bush", - "block.antarchy.torchflower_bush": "Torchflower Bush", - "item.antarchy.mud_pie": "Mud Pie", - "item.antarchy.duct_tape": "Duct Tape", - "item.antarchy.duct_tape.tooltip": "Place down and right-click to repair tools", - "item.antarchy.rainbow_sugar": "Rainbow Sugar", - "item.antarchy.uranium_nugget": "Uranium Nugget", - "item.antarchy.titanium_nugget": "Titanium Nugget", - "item.antarchy.raw_uranium_scrap": "Raw Uranium Scrap", - "item.antarchy.raw_titanium_scrap": "Raw Titanium Scrap", - "item.antarchy.raw_uranium": "Raw Uranium", - "item.antarchy.raw_titanium": "Raw Titanium", - "item.antarchy.uranium_ingot": "Uranium Ingot", - "item.antarchy.titanium_ingot": "Titanium Ingot", - "item.antarchy.blood_crystal_shard": "Blood Crystal Shard", - "item.antarchy.blood_crystal_apple": "Blood Crystal Apple", - "item.antarchy.blood_crystal_katana": "Blood Crystal Katana", - "item.antarchy.blood_crystal_helmet": "Blood Crystal Helmet", - "item.antarchy.blood_crystal_chestplate": "Blood Crystal Chestplate", - "item.antarchy.blood_crystal_leggings": "Blood Crystal Leggings", - "item.antarchy.blood_crystal_boots": "Blood Crystal Boots", - "item.antarchy.blood_crystal_armor.tooltip": "Grants a Bloodglass Heart that blocks one incoming hit, shatters, then recharges.", - "item.antarchy.blood_crystal_boots.tooltip2": "Cancels fall damage when falling upward while gravity is inverted.", - "item.antarchy.blood_crystal_apple.tooltip": "Grants Bloodglass Ward, providing temporary Bloodglass Hearts that recharge while the effect lasts.", - "tooltip.antarchy.blood_crystal_katana.launch": "Launches you forward on hit.", - "tooltip.antarchy.blood_crystal_katana.trail": "Leaves a crimson trail behind you.", - "item.antarchy.mantis_claw": "Mantis Claw", - "item.antarchy.king_scale": "King Scale", - "item.antarchy.queen_scale": "Queen Scale", - "item.antarchy.jumpy_bug_leg": "Jumpy Bug Leg", - "item.antarchy.jumpy_boots": "Jumpy Boots", - "tooltip.antarchy.jumpy_boots": "Sneak to charge, then jump to spring upward.", - "item.antarchy.brutalfly_wing": "Brutalfly Wing", - "item.antarchy.brutalfly_elytra": "Brutalfly Elytra", - "tooltip.antarchy.brutalfly_elytra.flap": "While flying, hold %s to flap your wings", - "item.antarchy.cornea_ear": "Ear of Cornea", - "item.antarchy.primordial_scute": "Primordial Scute", - "item.antarchy.triffid_goo": "Triffid Goo", - "item.antarchy.triffid_goo_block": "Triffid Goo Block", - "tooltip.antarchy.triffid_goo_block": "At high velocity bounce up, otherwise sink through.", - "item.antarchy.cloud_bucket": "Cloud Bucket", - "tooltip.antarchy.cloud_bucket.midair": "Can be placed midair", - "item.antarchy.scorpion_whip": "Emperor Scorpion Whip", - "tooltip.antarchy.scorpion_whip.lash": "Lashes prey from afar and embeds a venomous tether.", - "tooltip.antarchy.scorpion_whip.reel": "Right-click to reel tethered prey.", - "tooltip.antarchy.scorpion_whip.snap": "Left-click tethered prey again to snap the stinger free.", - "item.antarchy.fallen_king_crown": "Fallen King's Crown", - "tooltip.antarchy.fallen_king_crown.hero": "Grants Hero of the Village when you slay hostile mobs", - "item.antarchy.vortex_eye": "Vortex Eye", - "item.antarchy.ultimate_helmet": "Ultimate Helmet", - "item.antarchy.ultimate_chestplate": "Ultimate Chestplate", - "item.antarchy.ultimate_leggings": "Ultimate Leggings", - "item.antarchy.ultimate_boots": "Ultimate Boots", - "item.antarchy.ultimate_sword": "Ultimate Sword", - "item.antarchy.ultimate_pickaxe": "Ultimate Pickaxe", - "item.antarchy.ultimate_axe": "Ultimate Axe", - "item.antarchy.ultimate_shovel": "Ultimate Shovel", - "item.antarchy.ultimate_hoe": "Ultimate Hoe", - "item.antarchy.ultimate_bow": "Ultimate Bow", - "item.antarchy.ultimate_crossbow": "Ultimate Crossbow", - "item.antarchy.ultimate_crossbow.capacity": "Loads up to 16 arrows at once", - "item.antarchy.ultimate_crossbow.arrows_remaining": "%1$s %2$s loaded", - "item.antarchy.ultimate_mace": "Ultimate Mace", - "item.antarchy.moggles": "Moggles", - "itemGroup.antarchy.antarchy": "Antarchy", - "item.antarchy.bile_bucket": "Bile Bucket", - "item.antarchy.ichor_bucket": "Ichor Bucket", - "item.antarchy.antiwater_bucket": "Antiwater Bucket", - "item.antarchy.reverie_bottle": "Bottle of Reverie", - "item.antarchy.squidzooka": "Squidzooka", - "item.antarchy.shrink_ray": "Shrink Ray", - "item.antarchy.growth_ray": "Growth Ray", - "tooltip.antarchy.shrink_ray": "Permanently shrinks targets. Hold down to charge.", - "tooltip.antarchy.growth_ray": "Permanently Grows Targets. Hold down to charge.", - "tooltip.antarchy.reverie_bottle.capture": "Right click a Reverie with a glass bottle to store it.", - "tooltip.antarchy.reverie_bottle.release": "Right click to release the Reverie.", - "item.antarchy.gravity_gun": "Gravity Gun", - "item.antarchy.diamond_minecart": "The Diamond Minecart", - "item.antarchy.cogwheel_pet": "Cogwheel Pet", - "item.antarchy.fire_dragon_pet": "Fire Dragon Pet", - "item.antarchy.ice_dragon_pet": "Ice Dragon Pet", - "item.antarchy.lightning_dragon_pet": "Lightning Dragon Pet", - "item.antarchy.gorgon_pet": "Gorgon Pet", - "item.antarchy.apple_cow_spawn_egg": "Apple Cow Spawn Egg", - "item.antarchy.red_ant_spawn_egg": "Red Ant Spawn Egg", - "item.antarchy.brown_ant_spawn_egg": "Brown Ant Spawn Egg", - "item.antarchy.rainbow_ant_spawn_egg": "Rainbow Ant Spawn Egg", - "item.antarchy.termite_spawn_egg": "Termite Spawn Egg", - "item.antarchy.golden_apple_cow_spawn_egg": "Golden Apple Cow Spawn Egg", - "item.antarchy.enchanted_golden_apple_cow_spawn_egg": "Enchanted Golden Apple Cow Spawn Egg", - "item.antarchy.honeyed_apple_cow_spawn_egg": "Honeyed Apple Cow Spawn Egg", - "item.antarchy.dr_trayaurus_spawn_egg": "Dr. Trayaurus Spawn Egg", - "item.antarchy.easter_bunny_spawn_egg": "Easter Bunny Spawn Egg", - "item.antarchy.flying_squirrel_spawn_egg": "Flying Squirrel Spawn Egg", - "item.antarchy.caterpillar_spawn_egg": "Caterpillar Spawn Egg", - "item.antarchy.butterfly_spawn_egg": "Butterfly Spawn Egg", - "item.antarchy.brutalfly_spawn_egg": "Brutalfly Spawn Egg", - "item.antarchy.cloud_shark_spawn_egg": "Cloud Shark Spawn Egg", - "item.antarchy.kraken_spawn_egg": "Uh, no. Don't.", - "item.antarchy.missile_squid_spawn_egg": "Missile Squid Spawn Egg", - "item.antarchy.octopus_bomb_spawn_egg": "Octopus Bomb Spawn Egg", - "item.antarchy.nightmare_spawn_egg": "Nightmare Spawn Egg", - "item.antarchy.toreterror_spawn_egg": "Toreterror Spawn Egg", - "item.antarchy.creeping_horror_spawn_egg": "Creeping Horror Spawn Egg", - "item.antarchy.lurking_terror_spawn_egg": "Lurking Terror Spawn Egg", - "item.antarchy.water_cannon": "Water Cannon", - "item.antarchy.primordial_scute": "Primordial Scute", - "item.antarchy.primordial_helmet": "Primordial Helmet", - "item.antarchy.primordial_chestplate": "Primordial Chestplate", - "item.antarchy.primordial_leggings": "Primordial Leggings", - "item.antarchy.primordial_boots": "Primordial Boots", - "item.antarchy.bed_bug_spawn_egg": "Bed Bug Spawn Egg", - "item.antarchy.moleworm_spawn_egg": "Moleworm Spawn Egg", - "item.antarchy.molevore_spawn_egg": "Molevore Spawn Egg", - "item.antarchy.reverie_spawn_egg": "Reverie Spawn Egg", - "item.antarchy.mantis_spawn_egg": "Mantis Spawn Egg", - "item.antarchy.alpha_mantis_spawn_egg": "Alpha Mantis Spawn Egg", - "biome.antarchy.moleworm_caves": "Moleworm Caves", - "biome.antarchy.butterfly_fields": "Butterfly Fields", - "biome.antarchy.torchflower_fields": "Torchflower Fields", - "biome.antarchy.ouranwood_forest": "Ouranwood Forest", - "biome.antarchy.fungal_ouranwood_forest": "Fungal Ouranwood Forest", - "message.antarchy.brown_ant_activated": "The brown ant is ready to open its destination.", - "message.antarchy.brown_ant_needs_reagent": "This brown ant needs a reagent before it can open its destination.", - "message.antarchy.rainbow_ant_activated": "The rainbow ant hums with a new Infinity destination.", - "message.antarchy.rainbow_ant_activated_inherited": "The rainbow ant hums with an inherited Infinity destination.", - "message.antarchy.rainbow_ant_activated_inherited_existing": "The rainbow ant reconnects to an inherited Infinity destination.", - "message.antarchy.rainbow_ant_failed_dimension_create": "Failed to create dimension. This likely means something is wrong in your infinity config. Restart/Relog and try again.", - "message.antarchy.rainbow_ant_infinity_missing": "Infinity must be installed for rainbow ant dimensions to work.", - "message.antarchy.rainbow_ant_needs_reagent": "This rainbow ant needs a reagent before it can open a dimension.", - "message.antarchy.red_ant_activated": "The red ant is ready to open its destination.", - "message.antarchy.red_ant_needs_reagent": "This red ant needs a reagent before it can open its destination.", - "message.antarchy.termite_activated": "The termite is ready to open its destination.", - "message.antarchy.termite_needs_reagent": "This termite needs a reagent before it can open its destination.", - "message.antarchy.big_bertha.mode": "Big Bertha Mode: %s", - "message.antarchy.big_bertha.mode.basilisk": "Basilisk", - "message.antarchy.big_bertha.mode.lucid": "Lucid", - "message.antarchy.big_bertha.mode.nightmare": "Nightmare", - "message.antarchy.big_bertha.mode.kraken": "Kraken", - "message.antarchy.big_bertha.mode.molevore": "Molevore", - "message.antarchy.big_bertha.mode.toreterror": "Toreterror", - "message.antarchy.ultimate_tool.mode_3x3": "Switched to 3x3 Mining", - "message.antarchy.ultimate_tool.mode_default": "Switched to Default Mining", - "advancements.antarchy.hey_listen.title": "Hey Listen", - "advancements.antarchy.hey_listen.description": "A Reverie has joined you.", - "advancements.antarchy.very_hungry_caterpillar.title": "Very Hungry Caterpillar", - "advancements.antarchy.very_hungry_caterpillar.description": "Help a caterpillar grow.", - "effect.antarchy.dread": "Dread", - "effect.antarchy.paralyzed": "Paralyzed", - "effect.antarchy.inverted": "Inverted", - "effect.antarchy.stinky": "Stinky", - "effect.antarchy.shrinking": "Shrinking", - "effect.antarchy.growth": "Growth", - "effect.antarchy.bloodglass_ward": "Bloodglass Ward", - "death.attack.triffid_mauling": "%1$s was mauled to death by a plant", - "death.attack.triffid_mauling.player": "%1$s was mauled to death by a plant", - "death.attack.triffid_swallow": "%1$s was swallowed by a triffid", - "death.attack.triffid_swallow.player": "%1$s was swallowed by a triffid", - "potion.antarchy.haste": "Haste Potion", - "potion.antarchy.strong_haste": "Strong Haste Potion", - "tooltip.antarchy.big_bertha.mode": "Mode: %s", - "tooltip.antarchy.big_bertha.toggle_mode": "Shift-right-click to cycle boss modes.", - "tooltip.antarchy.big_bertha.mode.basilisk": "Right-click paralyzes a target. Hits inflict poison and slow.", - "tooltip.antarchy.big_bertha.mode.lucid": "Hits invert targets for a few seconds. Hits deal more damage while you are inverted.", - "tooltip.antarchy.big_bertha.mode.nightmare": "Players suffer Dread; hits inflict weakness.", - "tooltip.antarchy.big_bertha.mode.kraken": "Hits slam targets back and call lightning.", - "tooltip.antarchy.big_bertha.mode.molevore": "Right-click to spin forward and drill through Molevore blocks.", - "tooltip.antarchy.big_bertha.mode.toreterror": "Right-click to launch into the air and crash down with an AOE shockwave.", - "tooltip.antarchy.ultimate_tools_3x3": "Shift-right-click to toggle 3x3 Mining.", - "tooltip.antarchy.moggles.reveal": "Gives night vision and points to nearby caves.", - "tooltip.antarchy.moggles.underground": "Works only while you have no sky access.", - "tooltip.antarchy.cornea_ear.vision": "Grants Night Vision for %s seconds.", - "tooltip.antarchy.mob_coming_soon": "Mob Coming Soon!", - "tooltip.antarchy.gravity_gun.primary": "Left-click: blast nearby entities or throw the held target.", - "tooltip.antarchy.gravity_gun.secondary": "Right-click: pull in an entity or a valid block.", - "tooltip.antarchy.gravity_gun.scroll": "Hold Ctrl and scroll to move the held target closer or farther away.", - "tooltip.antarchy.gravity_gun.blacklist": "Does not affect blacklisted blocks or entities.", - "tooltip.antarchy.antimetal_inversion": "Inverts entites directly below it", - "tooltip.antarchy.diamond_minecart.forward": "Will be implemented later.", - "tooltip.antarchy.diamond_minecart.rails": " ", - "tooltip.antarchy.rainbow_sugar": "Activates Rainbow Ant Dimensions. Eat while in one to return home.", - "advancements.antarchy.visit_elythia.title": "InterdimANTsional", - "advancements.antarchy.visit_elythia.description": "Use a brown ant to reach Elythia.", - "advancements.antarchy.visit_thoraxis.title": "Ant-ger Management", - "advancements.antarchy.visit_thoraxis.description": "Use a red ant to reach Thoraxis.", - "advancements.antarchy.fallen_kingdom_castle.title": "I Used to Rule the World...", - "advancements.antarchy.fallen_kingdom_castle.description": "Discover the Fallen Kingdom Castle.", - "advancements.antarchy.fallen_king_crown.title": "Chunks would load when I gave the word...", - "advancements.antarchy.fallen_king_crown.description": "Obtain the Fallen King's Crown.", - "advancements.antarchy.visit_cavaryn.title": "You will be Termite-ated", - "advancements.antarchy.visit_cavaryn.description": "Use a termite to reach Cavaryn.", - "advancements.antarchy.the_lab.title": "Hello Everyone, Dan Here!", - "advancements.antarchy.the_lab.description": "Discover Dr. Trayaurus' lab.", - "advancements.antarchy.sweater_dreams.title": "Sweater Dreams", - "advancements.antarchy.sweater_dreams.description": "Defeat the Nightmare.", - "advancements.antarchy.stone_cold.title": "Stone Cold", - "advancements.antarchy.stone_cold.description": "Defeat a Basilisk.", - "advancements.antarchy.moley_poley.title": "Moley Poley", - "advancements.antarchy.moley_poley.description": "Defeat a Molevore.", - "advancements.antarchy.lucid_dreams.title": "Lucid Dreams", - "advancements.antarchy.lucid_dreams.description": "Defeat a Lucid.", - "advancements.antarchy.davy_jones_locker.title": "Davy Jones' Locker", - "advancements.antarchy.davy_jones_locker.description": "Defeat the Kraken.", - "advancements.antarchy.shark_weak.title": "When Sharks Fly", - "advancements.antarchy.shark_weak.description": "Defeat a Cloud Shark.", - "advancements.antarchy.dont_let_the_bed_bugs_bite.title": "Don't Let the Bed Bugs Bite", - "advancements.antarchy.dont_let_the_bed_bugs_bite.description": "Defeat a Bed Bug.", - "advancements.antarchy.soups_up.title": "Soups Up", - "advancements.antarchy.soups_up.description": "Eat Cloud Shark Fin Soup.", - "advancements.antarchy.in_the_upside_down.title": "In the Upside Down", - "advancements.antarchy.in_the_upside_down.description": "Become inverted for the first time.", - "advancements.antarchy.whoever_smelt_it_dealt_it.title": "Whoever smelt it, dealt it", - "advancements.antarchy.whoever_smelt_it_dealt_it.description": "Get Stinky for the first time.", - "advancements.antarchy.ultimate_armor.title": "Ultimate Protection", - "advancements.antarchy.ultimate_armor.description": "Collect the full set of Ultimate Armor.", - "advancements.antarchy.ultimate_bow.title": "Bowhemian Rhapsody", - "advancements.antarchy.ultimate_bow.description": "Obtain an Ultimate Bow.", - "advancements.antarchy.brutalfly.title": "Float Like a Brutalfly, Sting Like a Bee", - "advancements.antarchy.brutalfly.description": "Obtain a Brutalfly Elytra.", - "advancements.antarchy.now_watch_me_whip.title": "Now Watch Me Whip", - "advancements.antarchy.now_watch_me_whip.description": "Now watch me nae nae", - "advancements.antarchy.kill_molevore.title": "Moley Poley", - "advancements.antarchy.kill_molevore.description": "Kill a Molevore.", - "advancements.antarchy.water_cannon_craft.title": "Wetter is Better!", - "advancements.antarchy.water_cannon_craft.description": "Obtain a Water Cannon.", - "advancements.antarchy.kill_toreterror.title": "More like Tore-Terrible Aim!", - "advancements.antarchy.kill_toreterror.description": "Defeat the Toreterror.", - "advancements.antarchy.challenge_games.title": "Challenge Games!", - "advancements.antarchy.challenge_games.description": "Enter the Ruined Arena.", - "advancements.antarchy.bugged_out.title": "Bugged Out", - "advancements.antarchy.bugged_out.description": "Defeat the Alpha Mantis.", - "death.attack.bed_bug_bite": "%1$s got bit by the bed bugs", - "death.attack.bed_bug_bite.player": "%1$s got bit by the bed bugs while fighting %2$s", - "message.antarchy.dread_too_scared_to_sleep": "You are too scared to sleep.", - "death.attack.kraken_mauling": "%1$s was dragged under by the Kraken", - "death.attack.kraken_mauling.player": "%1$s was dragged under by the Kraken while fighting %2$s", - "death.attack.kraken_lightning": "%1$s was struck down by the Kraken's storm", - "death.attack.kraken_lightning.player": "%1$s was struck down by the Kraken's storm while fighting %2$s", - "death.attack.nightmare_mauling": "%1$s was devoured by the Nightmare", - "death.attack.nightmare_mauling.player": "%1$s was devoured by the Nightmare while fighting %2$s", - "death.attack.basilisk_bite": "%1$s was swallowed by a Basilisk", - "death.attack.basilisk_bite.player": "%1$s was swallowed by a Basilisk while fighting %2$s", - "death.attack.emperor_scorpion_sting": "%1$s was stung by the Emperor Scorpion", - "death.attack.emperor_scorpion_sting.player": "%1$s was stung by the Emperor Scorpion while fighting %2$s", - "death.attack.cornea_stalk_prick": "%1$s was pricked to death by a Cornea Stalk", - "death.attack.toreterror_spin": "%1$s was beybladed to death by Toreterror", - "death.attack.toreterror_spin.player": "%1$s was beybladed to death by Toreterror", - "death.attack.toreterror_jump": "%1$s was pounded to death by Toreterror", - "death.attack.toreterror_jump.player": "%1$s was pounded to death by Toreterror", - "death.attack.water_soaked": "%1$s was super soaked to death by %2$s", - "death.attack.water_soaked.player": "%1$s was super soaked to death by %2$s", - "entity.antarchy.lucid": "Lucid", - "item.antarchy.lucid_spawn_egg": "Lucid Spawn Egg", - "item.antarchy.lucid_eye": "Lucid Eye", - "entity.antarchy.scorpion": "Scorpion", - "item.antarchy.scorpion_spawn_egg": "Scorpion Spawn Egg", - "entity.antarchy.basilisk": "Basilisk", - "item.antarchy.basilisk_spawn_egg": "Basilisk Spawn Egg", - "entity.antarchy.emperor_scorpion": "Emperor Scorpion", - "item.antarchy.emperor_scorpion_spawn_egg": "Emperor Scorpion Spawn Egg", - "item.antarchy.emperor_scorpion_stinger": "Emperor Scorpion Stinger", - "item.antarchy.lucid_pearl": "Lucid Pearl", - "tooltip.antarchy.lucid_pearl": "Throws an inverted-gravity projectile.", - "tooltip.antarchy.lucid_pearl.detail": "Teleports you to where it lands and applies Inverted.", - "subtitles.antarchy.squidzooka_fire": "Squidzooka fires", - "subtitles.antarchy.shrink_ray": "Shrink Ray fires", - "subtitles.antarchy.growth_ray": "Growth Ray fires", - "subtitles.antarchy.size_ray_charge": "Size Ray charges", - "subtitles.antarchy.ant_ambient": "Ants chirp", - "subtitles.antarchy.ant_idle": "Ants idle", - "subtitles.antarchy.ant_hurt": "Ants hurt", - "subtitles.antarchy.ant_bite": "Ants bite", - "subtitles.antarchy.ant_gather": "Ants gather", - "subtitles.antarchy.ant_nest": "Ant nest rustles", - "subtitles.antarchy.cloud_shark_bite": "Cloud Shark bites", - "subtitles.antarchy.cloud_shark_idle": "Cloud Shark idles", - "subtitles.antarchy.cloud_shark_hurt": "Cloud Shark hurts", - "subtitles.antarchy.cloud_shark_death": "Cloud Shark dies", - "subtitles.antarchy.cloud_shark_fly": "Cloud Shark flies", - "subtitles.antarchy.caterpillar_idle": "Caterpillar idles", - "subtitles.antarchy.caterpillar_hurt": "Caterpillar hurts", - "subtitles.antarchy.caterpillar_crawl": "Caterpillar crawls", - "subtitles.antarchy.butterfly_hurt": "Butterfly hurts", - "subtitles.antarchy.brutalfly_idle": "Brutalfly idles", - "subtitles.antarchy.brutalfly_death": "Brutalfly dies", - "subtitles.antarchy.thoraxis_nightmare_wastes_ambient": "Nightmare Wastes hums", - "subtitles.antarchy.thoraxis_nightmare_wastes_additions": "Nightmare Wastes stirs", - "subtitles.antarchy.thoraxis_nightmare_wastes_mood": "Nightmare Wastes murmurs", - "subtitles.antarchy.thoraxis_dream_dunes_ambient": "Dream Dunes whisper", - "subtitles.antarchy.thoraxis_dream_dunes_additions": "Dream Dunes rustle", - "subtitles.antarchy.thoraxis_dream_dunes_mood": "Dream Dunes sigh", - "subtitles.antarchy.thoraxis_lucid_pools_ambient": "Lucid Pools hum", - "subtitles.antarchy.thoraxis_lucid_pools_additions": "Lucid Pools curse", - "subtitles.antarchy.thoraxis_lucid_pools_mood": "Lucid Pools murmur", - "subtitles.antarchy.lucid_ambient": "Lucid hums", - "subtitles.antarchy.lucid_flying": "Lucid flutters", - "subtitles.antarchy.lucid_attack": "Lucid attacks", - "subtitles.antarchy.lucid_bolt": "Lucid bolt fires", - "subtitles.antarchy.lucid_hurt": "Lucid hurts", - "subtitles.antarchy.lucid_death": "Lucid dies", - "subtitles.antarchy.reverie_idle": "Reverie drifts", - "subtitles.antarchy.reverie_hurt": "Reverie hurts", - "subtitles.antarchy.reverie_worry": "Reverie worries", - "subtitles.antarchy.reverie_save": "Reverie saves you", - "subtitles.antarchy.reverie_join_player": "Reverie joins you", - "subtitles.antarchy.reverie_alert": "Reverie alerts you", - "subtitles.antarchy.flying_squirrel_idle": "Flying squirrel chirps", - "subtitles.antarchy.flying_squirrel_beg": "Flying squirrel begs for food", - "subtitles.antarchy.flying_squirrel_nut": "Flying squirrel eats", - "subtitles.antarchy.flying_squirrel_glide_loop": "Flying squirrel glides", - "subtitles.antarchy.flying_squirrel_hurt": "Flying squirrel hurts", - "subtitles.antarchy.flying_squirrel_death": "Flying squirrel dies", - "subtitles.antarchy.nightmare_idle": "Nightmare snarls", - "subtitles.antarchy.nightmare_hurt": "Nightmare hurts", - "subtitles.antarchy.nightmare_roar": "Nightmare roars", - "subtitles.antarchy.nightmare_death": "Nightmare dies", - "subtitles.antarchy.nightmare_bite": "Nightmare bites", - "subtitles.antarchy.nightmare_flap": "Nightmare flaps", - "subtitles.antarchy.triffid_attack": "Triffid attacks", - "subtitles.antarchy.triffid_grab": "Triffid grabs", - "subtitles.antarchy.triffid_hurt": "Triffid hurts", - "subtitles.antarchy.triffid_death": "Triffid dies", - "subtitles.antarchy.triffid_hiss": "Triffid hisses", - "subtitles.antarchy.triffid_growl": "Triffid growls", - "subtitles.antarchy.gravity_gun_pickup": "Gravity Gun picks up", - "subtitles.antarchy.gravity_gun_drop": "Gravity Gun drops", - "subtitles.antarchy.gravity_gun_hold_loop": "Gravity Gun hums", - "subtitles.antarchy.gravity_gun_launch": "Gravity Gun launches", - "subtitles.antarchy.gravity_gun_dryfire": "Gravity Gun dry fires", - "subtitles.antarchy.bed_bug_ambient": "Bed Bug chirps", - "subtitles.antarchy.bed_bug_hurt": "Bed Bug hurts", - "subtitles.antarchy.bed_bug_attack": "Bed Bug bites", - "subtitles.antarchy.wasp_idle": "Wasp buzzes", - "subtitles.antarchy.wasp_hurt": "Wasp hurts", - "subtitles.antarchy.wasp_attack": "Wasp stings", - "subtitles.antarchy.wasp_death": "Wasp dies", - "subtitles.antarchy.scorpion_ambient": "Scorpion rattles", - "subtitles.antarchy.scorpion_hurt": "Scorpion hurts", - "subtitles.antarchy.scorpion_attack": "Scorpion attacks", - "subtitles.antarchy.emperor_scorpion_ambient": "Emperor Scorpion rattles", - "subtitles.antarchy.emperor_scorpion_hurt": "Emperor Scorpion hurts", - "subtitles.antarchy.emperor_scorpion_attack": "Emperor Scorpion attacks", - "subtitles.antarchy.emperor_scorpion_roar": "Emperor Scorpion roars", - "subtitles.antarchy.moleworm_ambient": "Moleworm rustles", - "subtitles.antarchy.moleworm_hurt": "Moleworm hurts", - "subtitles.antarchy.moleworm_attack": "Moleworm attacks", - "subtitles.antarchy.moleworm_dig": "Moleworm digs", - "subtitles.antarchy.molevore_ambient": "Molevore rumbles", - "subtitles.antarchy.molevore_hurt": "Molevore hurts", - "subtitles.antarchy.molevore_attack": "Molevore attacks", - "subtitles.antarchy.molevore_dig": "Molevore digs", - "subtitles.antarchy.duct_tape_use": "Duct Tape tears", - "subtitles.antarchy.potent_nyxite_hypnotic_gas": "Potent Nyxite hisses", - "subtitles.antarchy.potent_nyxite_geyser_eruption": "Potent Nyxite erupts", - "subtitles.antarchy.potent_nyxite_geyser_continuous": "Potent Nyxite geyser roars", - "subtitles.antarchy.missile_squid_ambient": "Missile Squid hums", - "subtitles.antarchy.missile_squid_hurt": "Missile Squid hurts", - "subtitles.antarchy.missile_squid_death": "Missile Squid dies", - "subtitles.antarchy.missile_squid_attack": "Missile Squid attacks", - "subtitles.antarchy.kraken_flying_loop": "Kraken glides", - "subtitles.antarchy.kraken_flying_sideways_loop": "Kraken circles", - "subtitles.antarchy.kraken_attack": "Kraken strikes", - "subtitles.antarchy.kraken_spin": "Kraken spins", - "subtitles.antarchy.kraken_roar": "Kraken roars", - "subtitles.antarchy.kraken_summon": "Kraken emerges", - "subtitles.antarchy.kraken_hurt": "Kraken hurts", - "subtitles.antarchy.kraken_death": "Kraken dies", - "subtitles.antarchy.basilisk_idle_loop": "Basilisk idles", - "subtitles.antarchy.basilisk_slither_loop": "Basilisk slithers", - "subtitles.antarchy.basilisk_bite": "Basilisk bites", - "subtitles.antarchy.basilisk_hiss": "Basilisk hisses", - "subtitles.antarchy.basilisk_hurt": "Basilisk hurts", - "subtitles.antarchy.basilisk_death": "Basilisk dies", - "subtitles.antarchy.bomber_walk": "Bomber walks", - "subtitles.antarchy.bomber_knock": "Bomber gets hit", - "subtitles.antarchy.bomber_explode": "Bomber fuse hisses", - "subtitles.antarchy.toreterror_idle": "Toreterror idles", - "subtitles.antarchy.toreterror_hurt": "Toreterror hurts", - "subtitles.antarchy.toreterror_death": "Toreterror dies", - "subtitles.antarchy.toreterror_bomber_fire": "Toreterror launches bombers", - "subtitles.antarchy.toreterror_spin": "Toreterror spins", - "subtitles.antarchy.toreterror_ricochet": "Toreterror ricochets", - "subtitles.antarchy.water_cannon_fire": "Water Cannon fires", - "subtitles.antarchy.toreterror_jump_up": "Toreterror jumps", - "subtitles.antarchy.toreterror_jump_land": "Toreterror lands", - "subtitles.antarchy.creeping_horror_growl": "Creeping Horror growls", - "subtitles.antarchy.creeping_horror_hurt": "Creeping Horror hurts", - "subtitles.antarchy.creeping_horror_bite": "Creeping Horror bites", - "subtitles.antarchy.lurking_terror_snarl": "Lurking Terror snarls", - "subtitles.antarchy.lurking_terror_hurt": "Lurking Terror hurts", - "subtitles.antarchy.lurking_terror_bite": "Lurking Terror bites", - "subtitles.antarchy.lurking_terror_fly_loop": "Lurking Terror flies", - "subtitles.antarchy.stinky_fly": "Stinky flies buzz", - "item.minecraft.potion.effect.inversion": "Potion of Inversion", - "item.minecraft.potion.effect.long_inversion": "Potion of Inversion", - "item.minecraft.splash_potion.effect.inversion": "Splash Potion of Inversion", - "item.minecraft.splash_potion.effect.long_inversion": "Splash Potion of Inversion", - "item.minecraft.lingering_potion.effect.inversion": "Lingering Potion of Inversion", - "item.minecraft.lingering_potion.effect.long_inversion": "Lingering Potion of Inversion", - "item.minecraft.tipped_arrow.effect.inversion": "Arrow of Inversion", - "item.minecraft.tipped_arrow.effect.long_inversion": "Arrow of Inversion", - "item.minecraft.potion.effect.paralysis": "Potion of Paralysis", - "item.minecraft.potion.effect.long_paralysis": "Potion of Paralysis", - "item.minecraft.splash_potion.effect.paralysis": "Splash Potion of Paralysis", - "item.minecraft.splash_potion.effect.long_paralysis": "Splash Potion of Paralysis", - "item.minecraft.lingering_potion.effect.paralysis": "Lingering Potion of Paralysis", - "item.minecraft.lingering_potion.effect.long_paralysis": "Lingering Potion of Paralysis", - "item.minecraft.tipped_arrow.effect.paralysis": "Arrow of Paralysis", - "item.minecraft.tipped_arrow.effect.long_paralysis": "Arrow of Paralysis", - "item.minecraft.potion.effect.shrinking": "Potion of Shrinking", - "item.minecraft.potion.effect.strong_shrinking": "Potion of Shrinking II", - "item.minecraft.potion.effect.extreme_shrinking": "Potion of Shrinking III", - "item.minecraft.splash_potion.effect.shrinking": "Splash Potion of Shrinking", - "item.minecraft.splash_potion.effect.strong_shrinking": "Splash Potion of Shrinking II", - "item.minecraft.splash_potion.effect.extreme_shrinking": "Splash Potion of Shrinking III", - "item.minecraft.lingering_potion.effect.shrinking": "Lingering Potion of Shrinking", - "item.minecraft.lingering_potion.effect.strong_shrinking": "Lingering Potion of Shrinking II", - "item.minecraft.lingering_potion.effect.extreme_shrinking": "Lingering Potion of Shrinking III", - "item.minecraft.tipped_arrow.effect.shrinking": "Arrow of Shrinking", - "item.minecraft.tipped_arrow.effect.strong_shrinking": "Arrow of Shrinking II", - "item.minecraft.tipped_arrow.effect.extreme_shrinking": "Arrow of Shrinking III", - "item.minecraft.potion.effect.growing": "Potion of Growth", - "item.minecraft.potion.effect.strong_growing": "Potion of Growth II", - "item.minecraft.potion.effect.extreme_growing": "Potion of Growth III", - "item.minecraft.splash_potion.effect.growing": "Splash Potion of Growth", - "item.minecraft.splash_potion.effect.strong_growing": "Splash Potion of Growth II", - "item.minecraft.splash_potion.effect.extreme_growing": "Splash Potion of Growth III", - "item.minecraft.lingering_potion.effect.growing": "Lingering Potion of Growth", - "item.minecraft.lingering_potion.effect.strong_growing": "Lingering Potion of Growth II", - "item.minecraft.lingering_potion.effect.extreme_growing": "Lingering Potion of Growth III", - "item.minecraft.tipped_arrow.effect.growing": "Arrow of Growth", - "item.minecraft.tipped_arrow.effect.strong_growing": "Arrow of Growth II", - "item.minecraft.tipped_arrow.effect.extreme_growing": "Arrow of Growth III", - "item.minecraft.potion.effect.dread": "Potion of Dread", - "item.minecraft.potion.effect.long_dread": "Potion of Dread", - "item.minecraft.splash_potion.effect.dread": "Splash Potion of Dread", - "item.minecraft.splash_potion.effect.long_dread": "Splash Potion of Dread", - "item.minecraft.lingering_potion.effect.dread": "Lingering Potion of Dread", - "item.minecraft.lingering_potion.effect.long_dread": "Lingering Potion of Dread", - "item.minecraft.tipped_arrow.effect.dread": "Arrow of Dread", - "item.minecraft.tipped_arrow.effect.long_dread": "Arrow of Dread", - "item.minecraft.potion.effect.stinky": "Potion of Stink", - "item.minecraft.potion.effect.long_stinky": "Potion of Stink", - "item.minecraft.splash_potion.effect.stinky": "Splash Potion of Stink", - "item.minecraft.splash_potion.effect.long_stinky": "Splash Potion of Stink", - "item.minecraft.lingering_potion.effect.stinky": "Lingering Potion of Stink", - "item.minecraft.lingering_potion.effect.long_stinky": "Lingering Potion of Stink", - "item.minecraft.tipped_arrow.effect.stinky": "Arrow of Stink", - "item.minecraft.tipped_arrow.effect.long_stinky": "Arrow of Stink", - "item.minecraft.potion.effect.haste": "Potion of Haste", - "item.minecraft.potion.effect.strong_haste": "Potion of Haste II", - "item.minecraft.splash_potion.effect.haste": "Splash Potion of Haste", - "item.minecraft.splash_potion.effect.strong_haste": "Splash Potion of Haste II", - "item.minecraft.lingering_potion.effect.haste": "Lingering Potion of Haste", - "item.minecraft.lingering_potion.effect.strong_haste": "Lingering Potion of Haste II", - "item.minecraft.tipped_arrow.effect.haste": "Arrow of Haste", - "item.minecraft.tipped_arrow.effect.strong_haste": "Arrow of Haste II", - "subtitles.antarchy.squidzooka_fire": "Squidzooka fires", - "advancements.antarchy.visit_elythia.title": "InterdimANTsional", - "advancements.antarchy.visit_elythia.description": "Use a brown ant to reach Elythia.", - "advancements.antarchy.visit_thoraxis.title": "Ant-ger Management", - "advancements.antarchy.visit_thoraxis.description": "Use a red ant to reach Thoraxis.", - "advancements.antarchy.visit_cavaryn.title": "You will be Termite-ated", - "advancements.antarchy.visit_cavaryn.description": "Use a termite to reach Cavaryn.", - "advancements.antarchy.ultimate_armor.title": "Ultimate Protection", - "advancements.antarchy.ultimate_armor.description": "Collect the full set of Ultimate Armor.", - "advancements.antarchy.ultimate_bow.title": "Bowhemian Rhapsody", - "advancements.antarchy.ultimate_bow.description": "Obtain an Ultimate Bow.", - "advancements.antarchy.kill_molevore.title": "Moley Poley", - "advancements.antarchy.kill_molevore.description": "Kill a Molevore.", - "advancements.antarchy.water_cannon_craft.title": "Wetter is Better!", - "advancements.antarchy.water_cannon_craft.description": "Obtain a Water Cannon.", - "advancements.antarchy.kill_toreterror.title": "More like Tore-Terrible Aim!", - "advancements.antarchy.kill_toreterror.description": "Defeat the Toreterror.", - "advancements.antarchy.cancel_out.title": "1 - 1 = ?", - "advancements.antarchy.cancel_out.description": "Have Growth and Shrinking active at the same time.", - "death.attack.bed_bug_bite": "%1$s got bit by the bed bugs", - "death.attack.bed_bug_bite.player": "%1$s got bit by the bed bugs while fighting %2$s", - "death.attack.kraken_mauling": "%1$s was dragged under by the Kraken", - "death.attack.kraken_mauling.player": "%1$s was dragged under by the Kraken while fighting %2$s", - "death.attack.kraken_lightning": "%1$s was struck down by the Kraken's storm", - "death.attack.kraken_lightning.player": "%1$s was struck down by the Kraken's storm while fighting %2$s", - "death.attack.nightmare_mauling": "%1$s was devoured by the Nightmare", - "death.attack.nightmare_mauling.player": "%1$s was devoured by the Nightmare while fighting %2$s", - "death.attack.basilisk_bite": "%1$s was swallowed by a Basilisk", - "death.attack.basilisk_bite.player": "%1$s was swallowed by a Basilisk while fighting %2$s", - "death.attack.emperor_scorpion_sting": "%1$s was stung by the Emperor Scorpion", - "death.attack.emperor_scorpion_sting.player": "%1$s was stung by the Emperor Scorpion while fighting %2$s", - "death.attack.cornea_stalk_prick": "%1$s was pricked to death by a Cornea Stalk", - "death.attack.toreterror_spin": "%1$s was beybladed to death by Toreterror", - "death.attack.toreterror_spin.player": "%1$s was beybladed to death by Toreterror", - "death.attack.toreterror_jump": "%1$s was pounded to death by Toreterror", - "death.attack.toreterror_jump.player": "%1$s was pounded to death by Toreterror", - "death.attack.water_soaked": "%1$s was super soaked to death by %2$s", - "death.attack.water_soaked.player": "%1$s was super soaked to death by %2$s", - "entity.antarchy.cheep": "Cheep", - "entity.antarchy.dorrie": "Dorrie", - "entity.antarchy.hercules_beetle": "Hercules Beetle", - "item.antarchy.cheep": "Cheep", - "item.antarchy.cheep_spawn_egg": "Cheep Spawn Egg", - "item.antarchy.dorrie_spawn_egg": "Dorrie Spawn Egg", - "item.antarchy.hercules_beetle_spawn_egg": "Hercules Beetle Spawn Egg", - "key.antarchy.dorrie_charge_jump": "Dorrie: Charge Jump", - "key.antarchy.hercules_beetle_charge": "Hercules Beetle: Charge", - "entity.antarchy.rolly_polly": "Rolly Polly", - "item.antarchy.rolly_polly_spawn_egg": "Rolly Polly Spawn Egg", - "key.antarchy.rolly_polly_roll": "Rolly Polly: Roll", - "entity.antarchy.reverie": "Reverie", - "biome.antarchy.rolly_caves": "Rolly Caves", - "biome.antarchy.thoraxis": "Thoraxis", - "biome.antarchy.nightmare_wastes": "Nightmare Wastes", - "biome.antarchy.umbral_hills": "Umbral Hills", - "biome.antarchy.lucid_pools": "Lucid Pools", - "biome.antarchy.dream_dunes": "Dream Dunes", - "biome.antarchy.cloud_sea": "Cloud Sea", - - "trim_material.antarchy.blood_crystal": "Blood Crystal", - "trim_material.antarchy.nightmare_scale": "Nightmare Scale", - "trim_material.antarchy.uranium": "Uranium", - "trim_material.antarchy.titanium": "Titanium", - "advancements.antarchy.duct_tape.title": "I sawed this boat in half!", - "advancements.antarchy.duct_tape.description": "and fixed it with the power of duct tape!", - "key.categories.antarchy": "Antarchy", - "key.antarchy.brutalfly_flap": "Brutalfly Elytra: Flap", - "advancements.antarchy.shrink_ray_craft.title": "Honey, I Shrunk the Mobs", - "advancements.antarchy.shrink_ray_craft.description": "Craft a Shrink Ray.", - "advancements.antarchy.growth_ray_craft.title": "Go Big or Go Home", - "advancements.antarchy.growth_ray_craft.description": "Craft a Growth Ray.", - "advancements.antarchy.squidzooka_craft.title": "Ink and Destroy", - "advancements.antarchy.squidzooka_craft.description": "Craft a Squidzooka.", - "advancements.antarchy.gravity_gun_craft.title": "Pick Up Artist", - "advancements.antarchy.gravity_gun_craft.description": "Craft a Gravity Gun." + "block.antarchy.duplicator_log": "Duplicator Log", + "block.antarchy.ouranwood_log": "Ouranwood Log", + "block.antarchy.ouranwood_wood": "Ouranwood Wood", + "block.antarchy.mossy_ouranwood_log": "Mossy Ouranwood Log", + "block.antarchy.mossy_ouranwood_wood": "Mossy Ouranwood Wood", + "block.antarchy.stripped_ouranwood_log": "Stripped Ouranwood Log", + "block.antarchy.stripped_ouranwood_wood": "Stripped Ouranwood Wood", + "block.antarchy.ouranwood_planks": "Ouranwood Planks", + "block.antarchy.ouranwood_stairs": "Ouranwood Stairs", + "block.antarchy.ouranwood_slab": "Ouranwood Slab", + "block.antarchy.ouranwood_fence": "Ouranwood Fence", + "block.antarchy.ouranwood_fence_gate": "Ouranwood Fence Gate", + "block.antarchy.ouranwood_door": "Ouranwood Door", + "block.antarchy.ouranwood_trapdoor": "Ouranwood Trapdoor", + "block.antarchy.ouranwood_pressure_plate": "Ouranwood Pressure Plate", + "block.antarchy.ouranwood_button": "Ouranwood Button", + "block.antarchy.ouranwood_leaves": "Ouranwood Leaves", + "block.antarchy.ouranwood_acorn": "Ouranwood Acorn", + "block.antarchy.ouranwood_vine": "Ouranwood Vine", + "block.antarchy.ouranwood_sign": "Ouranwood Sign", + "block.antarchy.ouranwood_hanging_sign": "Ouranwood Hanging Sign", + "block.antarchy.orange_milkweed": "Orange Milkweed", + "block.antarchy.pink_milkweed": "Pink Milkweed", + "block.antarchy.hushweed": "Hushweed", + "block.antarchy.big_bush": "Big Bush", + "block.antarchy.big_bush_part": "Big Bush", + "block.antarchy.very_short_grass": "Very Short Grass", + "block.antarchy.very_tall_grass": "Very Tall Grass", + "block.antarchy.umbral_moss_block": "Umbral Moss Block", + "block.antarchy.umbral_moss_carpet": "Umbral Moss Carpet", + "block.antarchy.duplicator_sapling": "Duplicator Sapling", + "block.antarchy.duct_tape": "Duct Tape", + "block.antarchy.infested_rooted_dirt": "Infested Rooted Dirt", + "block.antarchy.infested_coarse_dirt": "Infested Coarse Dirt", + "block.antarchy.nyxite": "Nyxite", + "block.antarchy.polished_nyxite": "Polished Nyxite", + "block.antarchy.chiseled_nyxite": "Chiseled Nyxite", + "block.antarchy.nyxite_bricks": "Nyxite Bricks", + "block.antarchy.shellstone": "Shellstone", + "block.antarchy.polished_shellstone": "Polished Shellstone", + "block.antarchy.shellstone_bricks": "Shellstone Bricks", + "block.antarchy.chiseled_shellstone": "Chiseled Shellstone", + "block.antarchy.mossy_shellstone_bricks": "Mossy Shellstone Bricks", + "block.antarchy.mossy_shellstone_brick_stairs": "Mossy Shellstone Brick Stairs", + "block.antarchy.mossy_shellstone_brick_slab": "Mossy Shellstone Brick Slab", + "block.antarchy.mossy_shellstone_brick_wall": "Mossy Shellstone Brick Wall", + "block.antarchy.cracked_shellstone_bricks": "Cracked Shellstone Bricks", + "block.antarchy.shellstone_stairs": "Shellstone Stairs", + "block.antarchy.shellstone_slab": "Shellstone Slab", + "block.antarchy.shellstone_wall": "Shellstone Wall", + "block.antarchy.polished_shellstone_stairs": "Polished Shellstone Stairs", + "block.antarchy.polished_shellstone_slab": "Polished Shellstone Slab", + "block.antarchy.polished_shellstone_wall": "Polished Shellstone Wall", + "block.antarchy.shellstone_brick_stairs": "Shellstone Brick Stairs", + "block.antarchy.shellstone_brick_slab": "Shellstone Brick Slab", + "block.antarchy.shellstone_brick_wall": "Shellstone Brick Wall", + "block.antarchy.nyxite_stairs": "Nyxite Stairs", + "block.antarchy.nyxite_slab": "Nyxite Slab", + "block.antarchy.nyxite_wall": "Nyxite Wall", + "block.antarchy.polished_nyxite_stairs": "Polished Nyxite Stairs", + "block.antarchy.polished_nyxite_slab": "Polished Nyxite Slab", + "block.antarchy.polished_nyxite_wall": "Polished Nyxite Wall", + "block.antarchy.nyxite_brick_stairs": "Nyxite Brick Stairs", + "block.antarchy.nyxite_brick_slab": "Nyxite Brick Slab", + "block.antarchy.nyxite_brick_wall": "Nyxite Brick Wall", + "block.antarchy.pale_nyxite": "Pale Nyxite", + "block.antarchy.nyxite_spike": "Nyxite Spike", + "block.antarchy.potent_nyxite": "Potent Nyxite", + "block.antarchy.triffid_goo_block": "Triffid Goo Block", + "block.antarchy.elythia_portal": "Elythia Portal", + "block.antarchy.cloud_block": "Cloud Block", + "block.antarchy.thoraxis_portal": "Thoraxis Portal", + "block.antarchy.antimetal": "Antimetal", + "block.antarchy.polished_antimetal": "Polished Antimetal", + "block.antarchy.antimetal_scaffolding": "Antimetal Scaffolding", + "block.antarchy.cornea_stalk": "Cornea Stalk", + "block.antarchy.dream_torch": "Dream Torch", + "block.antarchy.dream_wall_torch": "Dream Wall Torch", + "block.antarchy.dream_lantern": "Dream Lantern", + "block.antarchy.dream_campfire": "Dream Campfire", + "block.antarchy.dream_fire": "Dream Fire", + "block.antarchy.dream_fire_ceiling": "Dream Fire", + "block.antarchy.budding_blood_crystal": "Budding Blood Crystal", + "block.antarchy.blood_crystal_block": "Blood Crystal Block", + "block.antarchy.small_blood_crystal_bud": "Small Blood Crystal Bud", + "block.antarchy.medium_blood_crystal_bud": "Medium Blood Crystal Bud", + "block.antarchy.large_blood_crystal_bud": "Large Blood Crystal Bud", + "block.antarchy.blood_crystal_cluster": "Blood Crystal Cluster", + "block.antarchy.dream_sand": "Dream Sand", + "block.antarchy.dream_sandstone": "Dream Sandstone", + "block.antarchy.chiseled_dream_sandstone": "Chiseled Dream Sandstone", + "block.antarchy.cut_dream_sandstone": "Cut Dream Sandstone", + "block.antarchy.smooth_dream_sandstone": "Smooth Dream Sandstone", + "block.antarchy.dream_sandstone_stairs": "Dream Sandstone Stairs", + "block.antarchy.dream_sandstone_slab": "Dream Sandstone Slab", + "block.antarchy.dream_sandstone_wall": "Dream Sandstone Wall", + "block.antarchy.smooth_dream_sandstone_stairs": "Smooth Dream Sandstone Stairs", + "block.antarchy.smooth_dream_sandstone_slab": "Smooth Dream Sandstone Slab", + "block.antarchy.cut_dream_sandstone_slab": "Cut Dream Sandstone Slab", + "block.antarchy.bed_bug_egg": "Bed Bug Egg", + "block.antarchy.wasp_nest": "Wasp Nest", + "block.antarchy.red_ant_nest": "Red Ant Nest", + "block.antarchy.brown_ant_nest": "Brown Ant Nest", + "block.antarchy.rainbow_ant_nest": "Rainbow Ant Nest", + "block.antarchy.uranium_ore": "Uranium Ore", + "block.antarchy.deepslate_uranium_ore": "Deepslate Uranium Ore", + "block.antarchy.titanium_ore": "Titanium Ore", + "block.antarchy.deepslate_titanium_ore": "Deepslate Titanium Ore", + "block.antarchy.uranium_block": "Block of Uranium", + "block.antarchy.titanium_block": "Block of Titanium", + "block.antarchy.raw_uranium_block": "Block of Raw Uranium", + "block.antarchy.raw_titanium_block": "Block of Raw Titanium", + "block.antarchy.cut_uranium": "Cut Uranium", + "block.antarchy.cut_titanium": "Cut Titanium", + "block.antarchy.cut_uranium_slab": "Cut Uranium Slab", + "block.antarchy.cut_titanium_slab": "Cut Titanium Slab", + "block.antarchy.cut_uranium_stairs": "Cut Uranium Stairs", + "block.antarchy.cut_titanium_stairs": "Cut Titanium Stairs", + "block.antarchy.chiseled_uranium": "Chiseled Uranium", + "block.antarchy.chiseled_titanium": "Chiseled Titanium", + "block.antarchy.uranium_bulb": "Uranium Bulb", + "block.antarchy.titanium_bulb": "Titanium Bulb", + "block.antarchy.uranium_door": "Uranium Door", + "block.antarchy.titanium_door": "Titanium Door", + "block.antarchy.uranium_trapdoor": "Uranium Trapdoor", + "block.antarchy.titanium_trapdoor": "Titanium Trapdoor", + "block.antarchy.uranium_bars": "Uranium Bars", + "block.antarchy.titanium_bars": "Titanium Bars", + "tooltip.antarchy.signal_saving_bulb": "Toggles on/off. Has light level equal to the signal strength stored on it.", + "block.antarchy.bile": "Bile", + "block.antarchy.ichor": "Ichor", + "block.antarchy.antiwater": "Antiwater", + "entity.antarchy.apple_cow": "Apple Cow", + "entity.antarchy.golden_apple_cow": "Golden Apple Cow", + "entity.antarchy.enchanted_golden_apple_cow": "Enchanted Golden Apple Cow", + "entity.antarchy.honeyed_apple_cow": "Honeyed Apple Cow", + "entity.antarchy.easter_bunny": "Easter Bunny", + "entity.antarchy.glimmer": "Glimmer", + "entity.antarchy.flying_squirrel": "Flying Squirrel", + "entity.antarchy.caterpillar": "Caterpillar", + "entity.antarchy.butterfly": "Butterfly", + "entity.antarchy.brutalfly": "Brutalfly", + "entity.antarchy.red_ant": "Red Ant", + "entity.antarchy.brown_ant": "Brown Ant", + "entity.antarchy.rainbow_ant": "Rainbow Ant", + "entity.antarchy.diamond_minecart": "The Diamond Minecart", + "entity.antarchy.dr_trayaurus": "Dr. Trayaurus", + "entity.antarchy.cloud_shark": "Cloud Shark", + "entity.antarchy.kraken": "The Kraken", + "entity.antarchy.missile_squid": "Missile Squid", + "entity.antarchy.octopus_bomb": "Octopus Bomb", + "entity.antarchy.nightmare": "Nightmare", + "entity.antarchy.bed_bug": "Bed Bug", + "entity.antarchy.wasp": "Wasp", + "entity.antarchy.bomber": "Bomber", + "entity.antarchy.moleworm": "Moleworm", + "entity.antarchy.molevore": "Molevore", + "entity.antarchy.mantis": "Mantis", + "entity.antarchy.alpha_mantis": "Alpha Mantis", + "entity.antarchy.triffid": "Triffid", + "entity.antarchy.toreterror": "Toreterror", + "entity.antarchy.water_bomb": "Water Bomb", + "subtitles.antarchy.mantis_ambient": "Mantis clicks", + "subtitles.antarchy.mantis_hurt": "Mantis screeches", + "subtitles.antarchy.mantis_attack": "Mantis snaps", + "subtitles.antarchy.mantis_fly_loop": "Mantis wings buzz", + "item.antarchy.big_bertha": "Big Bertha", + "item.antarchy.wasp_nest": "Wasp Nest", + "item.antarchy.stink_bug": "Stink Bug", + "item.antarchy.wasp_spawn_egg": "Wasp Spawn Egg", + "item.antarchy.bomber_spawn_egg": "Bomber Spawn Egg", + "item.antarchy.big_bertha_blade": "Big Bertha Blade", + "item.antarchy.big_bertha_handle": "Big Bertha Handle", + "item.antarchy.big_bertha_hilt": "Big Bertha Hilt", + "item.antarchy.battle_axe": "Battle Axe", + "item.antarchy.cloud_shark_fin": "Cloud Shark Fin", + "item.antarchy.cloud_shark_fin_soup": "Cloud Shark Fin Soup", + "tooltip.antarchy.cloud_shark_fin_soup": "Grants Strength and Slow Falling.", + "item.antarchy.kraken_tooth": "Kraken Tooth", + "item.antarchy.basilisk_fang": "Basilisk Fang", + "item.antarchy.basilisk_dagger": "Basilisk Dagger", + "item.antarchy.blood_crystal_block": "Blood Crystal Block", + "item.antarchy.small_blood_crystal_bud": "Small Blood Crystal Bud", + "item.antarchy.medium_blood_crystal_bud": "Medium Blood Crystal Bud", + "item.antarchy.large_blood_crystal_bud": "Large Blood Crystal Bud", + "item.antarchy.blood_crystal_cluster": "Blood Crystal Cluster", + "item.antarchy.dream_sand": "Dream Sand", + "item.antarchy.dream_sandstone": "Dream Sandstone", + "item.antarchy.chiseled_dream_sandstone": "Chiseled Dream Sandstone", + "item.antarchy.cut_dream_sandstone": "Cut Dream Sandstone", + "item.antarchy.smooth_dream_sandstone": "Smooth Dream Sandstone", + "item.antarchy.dream_sandstone_stairs": "Dream Sandstone Stairs", + "item.antarchy.dream_sandstone_slab": "Dream Sandstone Slab", + "item.antarchy.dream_sandstone_wall": "Dream Sandstone Wall", + "item.antarchy.smooth_dream_sandstone_stairs": "Smooth Dream Sandstone Stairs", + "item.antarchy.smooth_dream_sandstone_slab": "Smooth Dream Sandstone Slab", + "item.antarchy.cut_dream_sandstone_slab": "Cut Dream Sandstone Slab", + "item.antarchy.dream_torch": "Dream Torch", + "item.antarchy.dream_lantern": "Dream Lantern", + "item.antarchy.dream_campfire": "Dream Campfire", + "item.antarchy.nightmare_scale": "Nightmare Scale", + "item.antarchy.nightmare_helmet": "Nightmare Helmet", + "item.antarchy.nightmare_chestplate": "Nightmare Chestplate", + "item.antarchy.nightmare_leggings": "Nightmare Leggings", + "item.antarchy.nightmare_boots": "Nightmare Boots", + "item.antarchy.nightmare_sword": "Nightmare Sword", + "tooltip.antarchy.nightmare_armor_double_damage": "%s%% chance to deal double damage", + "tooltip.antarchy.nightmare_armor_set_bonus": "Full Set: Wither \u0026 Dread immunity", + "tooltip.antarchy.nightmare_sword": "Deals more damage as your health drops.", + "tooltip.antarchy.nightmare_sword_damage": "Deals %s damage", + "tooltip.antarchy.primordial_helmet_water_breathing": "Grants the wearer Water Breathing", + "tooltip.antarchy.primordial_armor_knockback_dealt": "Adds %s attack knockback per piece", + "tooltip.antarchy.primordial_armor_set_bonus": "Full Set: Attacks ignore enemy knockback resistance", + "attribute.antarchy.double_damage_chance": "Double Damage Chance", + "attribute.antarchy.bloodglass_max_hearts": "Max Bloodglass Hearts", + "item.antarchy.molevore_nose": "Molevore Nose", + "item.antarchy.moleworm": "Moleworm", + "item.antarchy.triffid_spawn_egg": "Triffid Spawn Egg", + "item.antarchy.infested_rooted_dirt": "Infested Rooted Dirt", + "item.antarchy.infested_coarse_dirt": "Infested Coarse Dirt", + "item.antarchy.pale_nyxite": "Pale Nyxite", + "item.antarchy.polished_nyxite": "Polished Nyxite", + "item.antarchy.chiseled_nyxite": "Chiseled Nyxite", + "item.antarchy.nyxite_bricks": "Nyxite Bricks", + "item.antarchy.shellstone": "Shellstone", + "item.antarchy.polished_shellstone": "Polished Shellstone", + "item.antarchy.shellstone_bricks": "Shellstone Bricks", + "item.antarchy.chiseled_shellstone": "Chiseled Shellstone", + "item.antarchy.mossy_shellstone_bricks": "Mossy Shellstone Bricks", + "item.antarchy.mossy_shellstone_brick_stairs": "Mossy Shellstone Brick Stairs", + "item.antarchy.mossy_shellstone_brick_slab": "Mossy Shellstone Brick Slab", + "item.antarchy.mossy_shellstone_brick_wall": "Mossy Shellstone Brick Wall", + "item.antarchy.cracked_shellstone_bricks": "Cracked Shellstone Bricks", + "item.antarchy.shellstone_stairs": "Shellstone Stairs", + "item.antarchy.shellstone_slab": "Shellstone Slab", + "item.antarchy.shellstone_wall": "Shellstone Wall", + "item.antarchy.polished_shellstone_stairs": "Polished Shellstone Stairs", + "item.antarchy.polished_shellstone_slab": "Polished Shellstone Slab", + "item.antarchy.polished_shellstone_wall": "Polished Shellstone Wall", + "item.antarchy.shellstone_brick_stairs": "Shellstone Brick Stairs", + "item.antarchy.shellstone_brick_slab": "Shellstone Brick Slab", + "item.antarchy.shellstone_brick_wall": "Shellstone Brick Wall", + "item.antarchy.nyxite_stairs": "Nyxite Stairs", + "item.antarchy.nyxite_slab": "Nyxite Slab", + "item.antarchy.nyxite_wall": "Nyxite Wall", + "item.antarchy.polished_nyxite_stairs": "Polished Nyxite Stairs", + "item.antarchy.polished_nyxite_slab": "Polished Nyxite Slab", + "item.antarchy.polished_nyxite_wall": "Polished Nyxite Wall", + "item.antarchy.nyxite_brick_stairs": "Nyxite Brick Stairs", + "item.antarchy.nyxite_brick_slab": "Nyxite Brick Slab", + "item.antarchy.nyxite_brick_wall": "Nyxite Brick Wall", + "item.antarchy.potent_nyxite": "Potent Nyxite", + "item.antarchy.antimetal": "Antimetal", + "item.antarchy.polished_antimetal": "Polished Antimetal", + "item.antarchy.antimetal_scaffolding": "Antimetal Scaffolding", + "item.antarchy.ouranwood_acorn": "Ouranwood Acorn", + "item.antarchy.ouranwood_vine": "Ouranwood Vine", + "item.antarchy.ouranwood_boat": "Ouranwood Boat", + "item.antarchy.ouranwood_chest_boat": "Ouranwood Chest Boat", + "item.antarchy.big_bush": "Big Bush", + "item.antarchy.big_bush.tooltip": "Can be bonemealed", + "item.antarchy.very_short_grass": "Very Short Grass", + "item.antarchy.very_tall_grass": "Very Tall Grass", + "item.antarchy.orange_milkweed": "Orange Milkweed", + "item.antarchy.pink_milkweed": "Pink Milkweed", + "item.antarchy.hushweed": "Hushweed", + "item.antarchy.umbral_moss_block": "Umbral Moss Block", + "item.antarchy.umbral_moss_carpet": "Umbral Moss Carpet", + "item.antarchy.torchflower_bush": "Torchflower Bush", + "block.antarchy.torchflower_bush": "Torchflower Bush", + "item.antarchy.mud_pie": "Mud Pie", + "item.antarchy.duct_tape": "Duct Tape", + "item.antarchy.duct_tape.tooltip": "Place down and right-click to repair tools", + "item.antarchy.rainbow_sugar": "Rainbow Sugar", + "item.antarchy.uranium_nugget": "Uranium Nugget", + "item.antarchy.titanium_nugget": "Titanium Nugget", + "item.antarchy.raw_uranium_scrap": "Raw Uranium Scrap", + "item.antarchy.raw_titanium_scrap": "Raw Titanium Scrap", + "item.antarchy.raw_uranium": "Raw Uranium", + "item.antarchy.raw_titanium": "Raw Titanium", + "item.antarchy.uranium_ingot": "Uranium Ingot", + "item.antarchy.titanium_ingot": "Titanium Ingot", + "item.antarchy.blood_crystal_shard": "Blood Crystal Shard", + "item.antarchy.blood_crystal_apple": "Blood Crystal Apple", + "item.antarchy.blood_crystal_katana": "Blood Crystal Katana", + "item.antarchy.blood_crystal_helmet": "Blood Crystal Helmet", + "item.antarchy.blood_crystal_chestplate": "Blood Crystal Chestplate", + "item.antarchy.blood_crystal_leggings": "Blood Crystal Leggings", + "item.antarchy.blood_crystal_boots": "Blood Crystal Boots", + "item.antarchy.blood_crystal_armor.tooltip": "Grants a Bloodglass Heart that blocks one incoming hit, shatters, then recharges.", + "item.antarchy.blood_crystal_boots.tooltip2": "Cancels fall damage when falling upward while gravity is inverted.", + "item.antarchy.blood_crystal_apple.tooltip": "Grants Bloodglass Ward, providing temporary Bloodglass Hearts that recharge while the effect lasts.", + "tooltip.antarchy.blood_crystal_katana.launch": "Launches you forward on hit.", + "tooltip.antarchy.blood_crystal_katana.trail": "Leaves a crimson trail behind you.", + "item.antarchy.mantis_claw": "Mantis Claw", + "item.antarchy.king_scale": "King Scale", + "item.antarchy.queen_scale": "Queen Scale", + "item.antarchy.jumpy_bug_leg": "Jumpy Bug Leg", + "item.antarchy.jumpy_boots": "Jumpy Boots", + "tooltip.antarchy.jumpy_boots": "Sneak to charge, then jump to spring upward.", + "item.antarchy.brutalfly_wing": "Brutalfly Wing", + "item.antarchy.brutalfly_elytra": "Brutalfly Elytra", + "tooltip.antarchy.brutalfly_elytra.flap": "While flying, hold %s to flap your wings", + "item.antarchy.cornea_ear": "Ear of Cornea", + "item.antarchy.primordial_scute": "Primordial Scute", + "item.antarchy.triffid_goo": "Triffid Goo", + "item.antarchy.triffid_goo_block": "Triffid Goo Block", + "tooltip.antarchy.triffid_goo_block": "At high velocity bounce up, otherwise sink through.", + "item.antarchy.cloud_bucket": "Cloud Bucket", + "tooltip.antarchy.cloud_bucket.midair": "Can be placed midair", + "item.antarchy.scorpion_whip": "Emperor Scorpion Whip", + "tooltip.antarchy.scorpion_whip.lash": "Lashes prey from afar and embeds a venomous tether.", + "tooltip.antarchy.scorpion_whip.reel": "Right-click to reel tethered prey.", + "tooltip.antarchy.scorpion_whip.snap": "Left-click tethered prey again to snap the stinger free.", + "item.antarchy.fallen_king_crown": "Fallen King\u0027s Crown", + "tooltip.antarchy.fallen_king_crown.hero": "Grants Hero of the Village when you slay hostile mobs", + "item.antarchy.vortex_eye": "Vortex Eye", + "item.antarchy.ultimate_helmet": "Ultimate Helmet", + "item.antarchy.ultimate_chestplate": "Ultimate Chestplate", + "item.antarchy.ultimate_leggings": "Ultimate Leggings", + "item.antarchy.ultimate_boots": "Ultimate Boots", + "item.antarchy.ultimate_sword": "Ultimate Sword", + "item.antarchy.ultimate_pickaxe": "Ultimate Pickaxe", + "item.antarchy.ultimate_axe": "Ultimate Axe", + "item.antarchy.ultimate_shovel": "Ultimate Shovel", + "item.antarchy.ultimate_hoe": "Ultimate Hoe", + "item.antarchy.ultimate_bow": "Ultimate Bow", + "item.antarchy.ultimate_crossbow": "Ultimate Crossbow", + "item.antarchy.ultimate_crossbow.capacity": "Loads up to 16 arrows at once", + "item.antarchy.ultimate_crossbow.arrows_remaining": "%1$s %2$s loaded", + "item.antarchy.ultimate_mace": "Ultimate Mace", + "item.antarchy.moggles": "Moggles", + "itemGroup.antarchy.antarchy": "Antarchy", + "item.antarchy.bile_bucket": "Bile Bucket", + "item.antarchy.ichor_bucket": "Ichor Bucket", + "item.antarchy.antiwater_bucket": "Antiwater Bucket", + "item.antarchy.reverie_bottle": "Bottle of Reverie", + "item.antarchy.squidzooka": "Squidzooka", + "item.antarchy.shrink_ray": "Shrink Ray", + "item.antarchy.growth_ray": "Growth Ray", + "tooltip.antarchy.shrink_ray": "Permanently shrinks targets. Hold down to charge.", + "tooltip.antarchy.growth_ray": "Permanently Grows Targets. Hold down to charge.", + "tooltip.antarchy.reverie_bottle.capture": "Right click a Reverie with a glass bottle to store it.", + "tooltip.antarchy.reverie_bottle.release": "Right click to release the Reverie.", + "item.antarchy.gravity_gun": "Gravity Gun", + "item.antarchy.diamond_minecart": "The Diamond Minecart", + "item.antarchy.cogwheel_pet": "Cogwheel Pet", + "item.antarchy.fire_dragon_pet": "Fire Dragon Pet", + "item.antarchy.ice_dragon_pet": "Ice Dragon Pet", + "item.antarchy.lightning_dragon_pet": "Lightning Dragon Pet", + "item.antarchy.gorgon_pet": "Gorgon Pet", + "item.antarchy.apple_cow_spawn_egg": "Apple Cow Spawn Egg", + "item.antarchy.red_ant_spawn_egg": "Red Ant Spawn Egg", + "item.antarchy.brown_ant_spawn_egg": "Brown Ant Spawn Egg", + "item.antarchy.rainbow_ant_spawn_egg": "Rainbow Ant Spawn Egg", + "item.antarchy.golden_apple_cow_spawn_egg": "Golden Apple Cow Spawn Egg", + "item.antarchy.enchanted_golden_apple_cow_spawn_egg": "Enchanted Golden Apple Cow Spawn Egg", + "item.antarchy.honeyed_apple_cow_spawn_egg": "Honeyed Apple Cow Spawn Egg", + "item.antarchy.dr_trayaurus_spawn_egg": "Dr. Trayaurus Spawn Egg", + "item.antarchy.easter_bunny_spawn_egg": "Easter Bunny Spawn Egg", + "item.antarchy.glimmer_spawn_egg": "Glimmer Spawn Egg", + "item.antarchy.flying_squirrel_spawn_egg": "Flying Squirrel Spawn Egg", + "item.antarchy.caterpillar_spawn_egg": "Caterpillar Spawn Egg", + "item.antarchy.butterfly_spawn_egg": "Butterfly Spawn Egg", + "item.antarchy.brutalfly_spawn_egg": "Brutalfly Spawn Egg", + "item.antarchy.cloud_shark_spawn_egg": "Cloud Shark Spawn Egg", + "item.antarchy.kraken_spawn_egg": "Uh, no. Don\u0027t.", + "item.antarchy.missile_squid_spawn_egg": "Missile Squid Spawn Egg", + "item.antarchy.octopus_bomb_spawn_egg": "Octopus Bomb Spawn Egg", + "item.antarchy.nightmare_spawn_egg": "Nightmare Spawn Egg", + "item.antarchy.toreterror_spawn_egg": "Toreterror Spawn Egg", + "item.antarchy.water_cannon": "Water Cannon", + "item.antarchy.primordial_helmet": "Primordial Helmet", + "item.antarchy.primordial_chestplate": "Primordial Chestplate", + "item.antarchy.primordial_leggings": "Primordial Leggings", + "item.antarchy.primordial_boots": "Primordial Boots", + "item.antarchy.bed_bug_spawn_egg": "Bed Bug Spawn Egg", + "item.antarchy.moleworm_spawn_egg": "Moleworm Spawn Egg", + "item.antarchy.molevore_spawn_egg": "Molevore Spawn Egg", + "item.antarchy.reverie_spawn_egg": "Reverie Spawn Egg", + "item.antarchy.mantis_spawn_egg": "Mantis Spawn Egg", + "item.antarchy.alpha_mantis_spawn_egg": "Alpha Mantis Spawn Egg", + "biome.antarchy.moleworm_caves": "Moleworm Caves", + "biome.antarchy.butterfly_fields": "Butterfly Fields", + "biome.antarchy.torchflower_fields": "Torchflower Fields", + "biome.antarchy.ouranwood_forest": "Ouranwood Forest", + "biome.antarchy.fungal_ouranwood_forest": "Fungal Ouranwood Forest", + "message.antarchy.brown_ant_activated": "The brown ant is ready to open its destination.", + "message.antarchy.brown_ant_needs_reagent": "This brown ant needs a reagent before it can open its destination.", + "message.antarchy.rainbow_ant_activated": "The rainbow ant hums with a new Infinity destination.", + "message.antarchy.rainbow_ant_activated_inherited": "The rainbow ant hums with an inherited Infinity destination.", + "message.antarchy.rainbow_ant_activated_inherited_existing": "The rainbow ant reconnects to an inherited Infinity destination.", + "message.antarchy.rainbow_ant_failed_dimension_create": "Failed to create dimension. This likely means something is wrong in your infinity config. Restart/Relog and try again.", + "message.antarchy.rainbow_ant_infinity_missing": "Infinity must be installed for rainbow ant dimensions to work.", + "message.antarchy.rainbow_ant_needs_reagent": "This rainbow ant needs a reagent before it can open a dimension.", + "message.antarchy.red_ant_activated": "The red ant is ready to open its destination.", + "message.antarchy.red_ant_needs_reagent": "This red ant needs a reagent before it can open its destination.", + "message.antarchy.termite_activated": "The termite is ready to open its destination.", + "message.antarchy.termite_needs_reagent": "This termite needs a reagent before it can open its destination.", + "message.antarchy.big_bertha.mode": "Big Bertha Mode: %s", + "message.antarchy.big_bertha.mode.basilisk": "Basilisk", + "message.antarchy.big_bertha.mode.lucid": "Lucid", + "message.antarchy.big_bertha.mode.nightmare": "Nightmare", + "message.antarchy.big_bertha.mode.kraken": "Kraken", + "message.antarchy.big_bertha.mode.molevore": "Molevore", + "message.antarchy.big_bertha.mode.toreterror": "Toreterror", + "message.antarchy.ultimate_tool.mode_3x3": "Switched to 3x3 Mining", + "message.antarchy.ultimate_tool.mode_default": "Switched to Default Mining", + "advancements.antarchy.hey_listen.title": "Hey Listen", + "advancements.antarchy.hey_listen.description": "A Reverie has joined you.", + "advancements.antarchy.very_hungry_caterpillar.title": "Very Hungry Caterpillar", + "advancements.antarchy.very_hungry_caterpillar.description": "Help a caterpillar grow.", + "effect.antarchy.dread": "Dread", + "effect.antarchy.paralyzed": "Paralyzed", + "effect.antarchy.inverted": "Inverted", + "effect.antarchy.stinky": "Stinky", + "effect.antarchy.glimmers_grace": "Glimmer's Grace", + "effect.antarchy.shrinking": "Shrinking", + "effect.antarchy.growth": "Growth", + "effect.antarchy.bloodglass_ward": "Bloodglass Ward", + "death.attack.triffid_mauling": "%1$s was mauled to death by a plant", + "death.attack.triffid_mauling.player": "%1$s was mauled to death by a plant", + "death.attack.triffid_swallow": "%1$s was swallowed by a triffid", + "death.attack.triffid_swallow.player": "%1$s was swallowed by a triffid", + "potion.antarchy.haste": "Haste Potion", + "potion.antarchy.strong_haste": "Strong Haste Potion", + "tooltip.antarchy.big_bertha.mode": "Mode: %s", + "tooltip.antarchy.big_bertha.toggle_mode": "Shift-right-click to cycle boss modes.", + "tooltip.antarchy.big_bertha.mode.basilisk": "Right-click paralyzes a target. Hits inflict poison and slow.", + "tooltip.antarchy.big_bertha.mode.lucid": "Hits invert targets for a few seconds. Hits deal more damage while you are inverted.", + "tooltip.antarchy.big_bertha.mode.nightmare": "Players suffer Dread; hits inflict weakness.", + "tooltip.antarchy.big_bertha.mode.kraken": "Hits slam targets back and call lightning.", + "tooltip.antarchy.big_bertha.mode.molevore": "Right-click to spin forward and drill through Molevore blocks.", + "tooltip.antarchy.big_bertha.mode.toreterror": "Right-click to launch into the air and crash down with an AOE shockwave.", + "tooltip.antarchy.ultimate_tools_3x3": "Shift-right-click to toggle 3x3 Mining.", + "tooltip.antarchy.moggles.reveal": "Gives night vision and points to nearby caves.", + "tooltip.antarchy.moggles.underground": "Works only while you have no sky access.", + "tooltip.antarchy.cornea_ear.vision": "Grants Night Vision for %s seconds.", + "tooltip.antarchy.mob_coming_soon": "Mob Coming Soon!", + "tooltip.antarchy.gravity_gun.primary": "Left-click: blast nearby entities or throw the held target.", + "tooltip.antarchy.gravity_gun.secondary": "Right-click: pull in an entity or a valid block.", + "tooltip.antarchy.gravity_gun.scroll": "Hold Ctrl and scroll to move the held target closer or farther away.", + "tooltip.antarchy.gravity_gun.blacklist": "Does not affect blacklisted blocks or entities.", + "tooltip.antarchy.antimetal_inversion": "Inverts entites directly below it", + "tooltip.antarchy.diamond_minecart.forward": "Will be implemented later.", + "tooltip.antarchy.diamond_minecart.rails": " ", + "tooltip.antarchy.rainbow_sugar": "Activates Rainbow Ant Dimensions. Eat while in one to return home.", + "advancements.antarchy.visit_elythia.title": "InterdimANTsional", + "advancements.antarchy.visit_elythia.description": "Use a brown ant to reach Elythia.", + "advancements.antarchy.visit_thoraxis.title": "Ant-ger Management", + "advancements.antarchy.visit_thoraxis.description": "Use a red ant to reach Thoraxis.", + "advancements.antarchy.fallen_kingdom_castle.title": "I Used to Rule the World...", + "advancements.antarchy.fallen_kingdom_castle.description": "Discover the Fallen Kingdom Castle.", + "advancements.antarchy.fallen_king_crown.title": "Chunks would load when I gave the word...", + "advancements.antarchy.fallen_king_crown.description": "Obtain the Fallen King\u0027s Crown.", + "advancements.antarchy.the_lab.title": "Hello Everyone, Dan Here!", + "advancements.antarchy.the_lab.description": "Discover Dr. Trayaurus\u0027 lab.", + "advancements.antarchy.sweater_dreams.title": "Sweater Dreams", + "advancements.antarchy.sweater_dreams.description": "Defeat the Nightmare.", + "advancements.antarchy.stone_cold.title": "Stone Cold", + "advancements.antarchy.stone_cold.description": "Defeat a Basilisk.", + "advancements.antarchy.moley_poley.title": "Moley Poley", + "advancements.antarchy.moley_poley.description": "Defeat a Molevore.", + "advancements.antarchy.lucid_dreams.title": "Lucid Dreams", + "advancements.antarchy.lucid_dreams.description": "Defeat a Lucid.", + "advancements.antarchy.davy_jones_locker.title": "Davy Jones\u0027 Locker", + "advancements.antarchy.davy_jones_locker.description": "Defeat the Kraken.", + "advancements.antarchy.shark_weak.title": "When Sharks Fly", + "advancements.antarchy.shark_weak.description": "Defeat a Cloud Shark.", + "advancements.antarchy.dont_let_the_bed_bugs_bite.title": "Don\u0027t Let the Bed Bugs Bite", + "advancements.antarchy.dont_let_the_bed_bugs_bite.description": "Defeat a Bed Bug.", + "advancements.antarchy.soups_up.title": "Soups Up", + "advancements.antarchy.soups_up.description": "Eat Cloud Shark Fin Soup.", + "advancements.antarchy.in_the_upside_down.title": "In the Upside Down", + "advancements.antarchy.in_the_upside_down.description": "Become inverted for the first time.", + "advancements.antarchy.whoever_smelt_it_dealt_it.title": "Whoever smelt it, dealt it", + "advancements.antarchy.whoever_smelt_it_dealt_it.description": "Get Stinky for the first time.", + "advancements.antarchy.ultimate_armor.title": "Ultimate Protection", + "advancements.antarchy.ultimate_armor.description": "Collect the full set of Ultimate Armor.", + "advancements.antarchy.ultimate_bow.title": "Bowhemian Rhapsody", + "advancements.antarchy.ultimate_bow.description": "Obtain an Ultimate Bow.", + "advancements.antarchy.brutalfly.title": "Float Like a Brutalfly, Sting Like a Bee", + "advancements.antarchy.brutalfly.description": "Obtain a Brutalfly Elytra.", + "advancements.antarchy.now_watch_me_whip.title": "Now Watch Me Whip", + "advancements.antarchy.now_watch_me_whip.description": "Now watch me nae nae", + "advancements.antarchy.kill_molevore.title": "Moley Poley", + "advancements.antarchy.kill_molevore.description": "Kill a Molevore.", + "advancements.antarchy.water_cannon_craft.title": "Wetter is Better!", + "advancements.antarchy.water_cannon_craft.description": "Obtain a Water Cannon.", + "advancements.antarchy.kill_toreterror.title": "More like Tore-Terrible Aim!", + "advancements.antarchy.kill_toreterror.description": "Defeat the Toreterror.", + "advancements.antarchy.challenge_games.title": "Challenge Games!", + "advancements.antarchy.challenge_games.description": "Enter the Ruined Arena.", + "advancements.antarchy.bugged_out.title": "Bugged Out", + "advancements.antarchy.bugged_out.description": "Defeat the Alpha Mantis.", + "death.attack.bed_bug_bite": "%1$s got bit by the bed bugs", + "death.attack.bed_bug_bite.player": "%1$s got bit by the bed bugs while fighting %2$s", + "message.antarchy.dread_too_scared_to_sleep": "You are too scared to sleep.", + "death.attack.kraken_mauling": "%1$s was dragged under by the Kraken", + "death.attack.kraken_mauling.player": "%1$s was dragged under by the Kraken while fighting %2$s", + "death.attack.kraken_lightning": "%1$s was struck down by the Kraken\u0027s storm", + "death.attack.kraken_lightning.player": "%1$s was struck down by the Kraken\u0027s storm while fighting %2$s", + "death.attack.nightmare_mauling": "%1$s was devoured by the Nightmare", + "death.attack.nightmare_mauling.player": "%1$s was devoured by the Nightmare while fighting %2$s", + "death.attack.basilisk_bite": "%1$s was swallowed by a Basilisk", + "death.attack.basilisk_bite.player": "%1$s was swallowed by a Basilisk while fighting %2$s", + "death.attack.emperor_scorpion_sting": "%1$s was stung by the Emperor Scorpion", + "death.attack.emperor_scorpion_sting.player": "%1$s was stung by the Emperor Scorpion while fighting %2$s", + "death.attack.cornea_stalk_prick": "%1$s was pricked to death by a Cornea Stalk", + "death.attack.toreterror_spin": "%1$s was beybladed to death by Toreterror", + "death.attack.toreterror_spin.player": "%1$s was beybladed to death by Toreterror", + "death.attack.toreterror_jump": "%1$s was pounded to death by Toreterror", + "death.attack.toreterror_jump.player": "%1$s was pounded to death by Toreterror", + "death.attack.water_soaked": "%1$s was super soaked to death by %2$s", + "death.attack.water_soaked.player": "%1$s was super soaked to death by %2$s", + "entity.antarchy.lucid": "Lucid", + "item.antarchy.lucid_spawn_egg": "Lucid Spawn Egg", + "item.antarchy.lucid_eye": "Lucid Eye", + "entity.antarchy.scorpion": "Scorpion", + "item.antarchy.scorpion_spawn_egg": "Scorpion Spawn Egg", + "entity.antarchy.basilisk": "Basilisk", + "item.antarchy.basilisk_spawn_egg": "Basilisk Spawn Egg", + "entity.antarchy.emperor_scorpion": "Emperor Scorpion", + "item.antarchy.emperor_scorpion_spawn_egg": "Emperor Scorpion Spawn Egg", + "item.antarchy.emperor_scorpion_stinger": "Emperor Scorpion Stinger", + "item.antarchy.lucid_pearl": "Lucid Pearl", + "tooltip.antarchy.lucid_pearl": "Throws an inverted-gravity projectile.", + "tooltip.antarchy.lucid_pearl.detail": "Teleports you to where it lands and applies Inverted.", + "subtitles.antarchy.squidzooka_fire": "Squidzooka fires", + "subtitles.antarchy.shrink_ray": "Shrink Ray fires", + "subtitles.antarchy.growth_ray": "Growth Ray fires", + "subtitles.antarchy.size_ray_charge": "Size Ray charges", + "subtitles.antarchy.ant_ambient": "Ants chirp", + "subtitles.antarchy.ant_idle": "Ants idle", + "subtitles.antarchy.ant_hurt": "Ants hurt", + "subtitles.antarchy.ant_bite": "Ants bite", + "subtitles.antarchy.ant_gather": "Ants gather", + "subtitles.antarchy.ant_nest": "Ant nest rustles", + "subtitles.antarchy.cloud_shark_bite": "Cloud Shark bites", + "subtitles.antarchy.cloud_shark_idle": "Cloud Shark idles", + "subtitles.antarchy.cloud_shark_hurt": "Cloud Shark hurts", + "subtitles.antarchy.cloud_shark_death": "Cloud Shark dies", + "subtitles.antarchy.cloud_shark_fly": "Cloud Shark flies", + "subtitles.antarchy.caterpillar_idle": "Caterpillar idles", + "subtitles.antarchy.caterpillar_hurt": "Caterpillar hurts", + "subtitles.antarchy.caterpillar_crawl": "Caterpillar crawls", + "subtitles.antarchy.butterfly_hurt": "Butterfly hurts", + "subtitles.antarchy.brutalfly_idle": "Brutalfly idles", + "subtitles.antarchy.brutalfly_death": "Brutalfly dies", + "subtitles.antarchy.thoraxis_nightmare_wastes_ambient": "Nightmare Wastes hums", + "subtitles.antarchy.thoraxis_nightmare_wastes_additions": "Nightmare Wastes stirs", + "subtitles.antarchy.thoraxis_nightmare_wastes_mood": "Nightmare Wastes murmurs", + "subtitles.antarchy.thoraxis_dream_dunes_ambient": "Dream Dunes whisper", + "subtitles.antarchy.thoraxis_dream_dunes_additions": "Dream Dunes rustle", + "subtitles.antarchy.thoraxis_dream_dunes_mood": "Dream Dunes sigh", + "subtitles.antarchy.thoraxis_lucid_pools_ambient": "Lucid Pools hum", + "subtitles.antarchy.thoraxis_lucid_pools_additions": "Lucid Pools curse", + "subtitles.antarchy.thoraxis_lucid_pools_mood": "Lucid Pools murmur", + "subtitles.antarchy.lucid_ambient": "Lucid hums", + "subtitles.antarchy.lucid_flying": "Lucid flutters", + "subtitles.antarchy.lucid_attack": "Lucid attacks", + "subtitles.antarchy.lucid_bolt": "Lucid bolt fires", + "subtitles.antarchy.lucid_hurt": "Lucid hurts", + "subtitles.antarchy.lucid_death": "Lucid dies", + "subtitles.antarchy.reverie_idle": "Reverie drifts", + "subtitles.antarchy.reverie_hurt": "Reverie hurts", + "subtitles.antarchy.reverie_worry": "Reverie worries", + "subtitles.antarchy.reverie_save": "Reverie saves you", + "subtitles.antarchy.reverie_join_player": "Reverie joins you", + "subtitles.antarchy.reverie_alert": "Reverie alerts you", + "subtitles.antarchy.flying_squirrel_idle": "Flying squirrel chirps", + "subtitles.antarchy.flying_squirrel_beg": "Flying squirrel begs for food", + "subtitles.antarchy.flying_squirrel_nut": "Flying squirrel eats", + "subtitles.antarchy.flying_squirrel_glide_loop": "Flying squirrel glides", + "subtitles.antarchy.flying_squirrel_hurt": "Flying squirrel hurts", + "subtitles.antarchy.flying_squirrel_death": "Flying squirrel dies", + "subtitles.antarchy.nightmare_idle": "Nightmare snarls", + "subtitles.antarchy.nightmare_hurt": "Nightmare hurts", + "subtitles.antarchy.nightmare_roar": "Nightmare roars", + "subtitles.antarchy.nightmare_death": "Nightmare dies", + "subtitles.antarchy.nightmare_bite": "Nightmare bites", + "subtitles.antarchy.nightmare_flap": "Nightmare flaps", + "subtitles.antarchy.triffid_attack": "Triffid attacks", + "subtitles.antarchy.triffid_grab": "Triffid grabs", + "subtitles.antarchy.triffid_hurt": "Triffid hurts", + "subtitles.antarchy.triffid_death": "Triffid dies", + "subtitles.antarchy.triffid_hiss": "Triffid hisses", + "subtitles.antarchy.triffid_growl": "Triffid growls", + "subtitles.antarchy.gravity_gun_pickup": "Gravity Gun picks up", + "subtitles.antarchy.gravity_gun_drop": "Gravity Gun drops", + "subtitles.antarchy.gravity_gun_hold_loop": "Gravity Gun hums", + "subtitles.antarchy.gravity_gun_launch": "Gravity Gun launches", + "subtitles.antarchy.gravity_gun_dryfire": "Gravity Gun dry fires", + "subtitles.antarchy.bed_bug_ambient": "Bed Bug chirps", + "subtitles.antarchy.bed_bug_hurt": "Bed Bug hurts", + "subtitles.antarchy.bed_bug_attack": "Bed Bug bites", + "subtitles.antarchy.wasp_idle": "Wasp buzzes", + "subtitles.antarchy.wasp_hurt": "Wasp hurts", + "subtitles.antarchy.wasp_attack": "Wasp stings", + "subtitles.antarchy.wasp_death": "Wasp dies", + "subtitles.antarchy.scorpion_ambient": "Scorpion rattles", + "subtitles.antarchy.scorpion_hurt": "Scorpion hurts", + "subtitles.antarchy.scorpion_attack": "Scorpion attacks", + "subtitles.antarchy.emperor_scorpion_ambient": "Emperor Scorpion rattles", + "subtitles.antarchy.emperor_scorpion_hurt": "Emperor Scorpion hurts", + "subtitles.antarchy.emperor_scorpion_attack": "Emperor Scorpion attacks", + "subtitles.antarchy.emperor_scorpion_roar": "Emperor Scorpion roars", + "subtitles.antarchy.moleworm_ambient": "Moleworm rustles", + "subtitles.antarchy.moleworm_hurt": "Moleworm hurts", + "subtitles.antarchy.moleworm_attack": "Moleworm attacks", + "subtitles.antarchy.moleworm_dig": "Moleworm digs", + "subtitles.antarchy.molevore_ambient": "Molevore rumbles", + "subtitles.antarchy.molevore_hurt": "Molevore hurts", + "subtitles.antarchy.molevore_attack": "Molevore attacks", + "subtitles.antarchy.molevore_dig": "Molevore digs", + "subtitles.antarchy.duct_tape_use": "Duct Tape tears", + "subtitles.antarchy.potent_nyxite_hypnotic_gas": "Potent Nyxite hisses", + "subtitles.antarchy.potent_nyxite_geyser_eruption": "Potent Nyxite erupts", + "subtitles.antarchy.potent_nyxite_geyser_continuous": "Potent Nyxite geyser roars", + "subtitles.antarchy.missile_squid_ambient": "Missile Squid hums", + "subtitles.antarchy.missile_squid_hurt": "Missile Squid hurts", + "subtitles.antarchy.missile_squid_death": "Missile Squid dies", + "subtitles.antarchy.missile_squid_attack": "Missile Squid attacks", + "subtitles.antarchy.kraken_flying_loop": "Kraken glides", + "subtitles.antarchy.kraken_flying_sideways_loop": "Kraken circles", + "subtitles.antarchy.kraken_attack": "Kraken strikes", + "subtitles.antarchy.kraken_spin": "Kraken spins", + "subtitles.antarchy.kraken_roar": "Kraken roars", + "subtitles.antarchy.kraken_summon": "Kraken emerges", + "subtitles.antarchy.kraken_hurt": "Kraken hurts", + "subtitles.antarchy.kraken_death": "Kraken dies", + "subtitles.antarchy.basilisk_idle_loop": "Basilisk idles", + "subtitles.antarchy.basilisk_slither_loop": "Basilisk slithers", + "subtitles.antarchy.basilisk_bite": "Basilisk bites", + "subtitles.antarchy.basilisk_hiss": "Basilisk hisses", + "subtitles.antarchy.basilisk_hurt": "Basilisk hurts", + "subtitles.antarchy.basilisk_death": "Basilisk dies", + "subtitles.antarchy.bomber_walk": "Bomber walks", + "subtitles.antarchy.bomber_knock": "Bomber gets hit", + "subtitles.antarchy.bomber_explode": "Bomber fuse hisses", + "subtitles.antarchy.toreterror_idle": "Toreterror idles", + "subtitles.antarchy.toreterror_hurt": "Toreterror hurts", + "subtitles.antarchy.toreterror_death": "Toreterror dies", + "subtitles.antarchy.toreterror_bomber_fire": "Toreterror launches bombers", + "subtitles.antarchy.toreterror_spin": "Toreterror spins", + "subtitles.antarchy.toreterror_ricochet": "Toreterror ricochets", + "subtitles.antarchy.water_cannon_fire": "Water Cannon fires", + "subtitles.antarchy.toreterror_jump_up": "Toreterror jumps", + "subtitles.antarchy.toreterror_jump_land": "Toreterror lands", + "subtitles.antarchy.stinky_fly": "Stinky flies buzz", + "item.minecraft.potion.effect.inversion": "Potion of Inversion", + "item.minecraft.potion.effect.long_inversion": "Potion of Inversion", + "item.minecraft.splash_potion.effect.inversion": "Splash Potion of Inversion", + "item.minecraft.splash_potion.effect.long_inversion": "Splash Potion of Inversion", + "item.minecraft.lingering_potion.effect.inversion": "Lingering Potion of Inversion", + "item.minecraft.lingering_potion.effect.long_inversion": "Lingering Potion of Inversion", + "item.minecraft.tipped_arrow.effect.inversion": "Arrow of Inversion", + "item.minecraft.tipped_arrow.effect.long_inversion": "Arrow of Inversion", + "item.minecraft.potion.effect.paralysis": "Potion of Paralysis", + "item.minecraft.potion.effect.long_paralysis": "Potion of Paralysis", + "item.minecraft.splash_potion.effect.paralysis": "Splash Potion of Paralysis", + "item.minecraft.splash_potion.effect.long_paralysis": "Splash Potion of Paralysis", + "item.minecraft.lingering_potion.effect.paralysis": "Lingering Potion of Paralysis", + "item.minecraft.lingering_potion.effect.long_paralysis": "Lingering Potion of Paralysis", + "item.minecraft.tipped_arrow.effect.paralysis": "Arrow of Paralysis", + "item.minecraft.tipped_arrow.effect.long_paralysis": "Arrow of Paralysis", + "item.minecraft.potion.effect.shrinking": "Potion of Shrinking", + "item.minecraft.potion.effect.strong_shrinking": "Potion of Shrinking II", + "item.minecraft.potion.effect.extreme_shrinking": "Potion of Shrinking III", + "item.minecraft.splash_potion.effect.shrinking": "Splash Potion of Shrinking", + "item.minecraft.splash_potion.effect.strong_shrinking": "Splash Potion of Shrinking II", + "item.minecraft.splash_potion.effect.extreme_shrinking": "Splash Potion of Shrinking III", + "item.minecraft.lingering_potion.effect.shrinking": "Lingering Potion of Shrinking", + "item.minecraft.lingering_potion.effect.strong_shrinking": "Lingering Potion of Shrinking II", + "item.minecraft.lingering_potion.effect.extreme_shrinking": "Lingering Potion of Shrinking III", + "item.minecraft.tipped_arrow.effect.shrinking": "Arrow of Shrinking", + "item.minecraft.tipped_arrow.effect.strong_shrinking": "Arrow of Shrinking II", + "item.minecraft.tipped_arrow.effect.extreme_shrinking": "Arrow of Shrinking III", + "item.minecraft.potion.effect.growing": "Potion of Growth", + "item.minecraft.potion.effect.strong_growing": "Potion of Growth II", + "item.minecraft.potion.effect.extreme_growing": "Potion of Growth III", + "item.minecraft.splash_potion.effect.growing": "Splash Potion of Growth", + "item.minecraft.splash_potion.effect.strong_growing": "Splash Potion of Growth II", + "item.minecraft.splash_potion.effect.extreme_growing": "Splash Potion of Growth III", + "item.minecraft.lingering_potion.effect.growing": "Lingering Potion of Growth", + "item.minecraft.lingering_potion.effect.strong_growing": "Lingering Potion of Growth II", + "item.minecraft.lingering_potion.effect.extreme_growing": "Lingering Potion of Growth III", + "item.minecraft.tipped_arrow.effect.growing": "Arrow of Growth", + "item.minecraft.tipped_arrow.effect.strong_growing": "Arrow of Growth II", + "item.minecraft.tipped_arrow.effect.extreme_growing": "Arrow of Growth III", + "item.minecraft.potion.effect.dread": "Potion of Dread", + "item.minecraft.potion.effect.long_dread": "Potion of Dread", + "item.minecraft.splash_potion.effect.dread": "Splash Potion of Dread", + "item.minecraft.splash_potion.effect.long_dread": "Splash Potion of Dread", + "item.minecraft.lingering_potion.effect.dread": "Lingering Potion of Dread", + "item.minecraft.lingering_potion.effect.long_dread": "Lingering Potion of Dread", + "item.minecraft.tipped_arrow.effect.dread": "Arrow of Dread", + "item.minecraft.tipped_arrow.effect.long_dread": "Arrow of Dread", + "item.minecraft.potion.effect.stinky": "Potion of Stink", + "item.minecraft.potion.effect.long_stinky": "Potion of Stink", + "item.minecraft.splash_potion.effect.stinky": "Splash Potion of Stink", + "item.minecraft.splash_potion.effect.long_stinky": "Splash Potion of Stink", + "item.minecraft.lingering_potion.effect.stinky": "Lingering Potion of Stink", + "item.minecraft.lingering_potion.effect.long_stinky": "Lingering Potion of Stink", + "item.minecraft.tipped_arrow.effect.stinky": "Arrow of Stink", + "item.minecraft.tipped_arrow.effect.long_stinky": "Arrow of Stink", + "item.minecraft.potion.effect.haste": "Potion of Haste", + "item.minecraft.potion.effect.strong_haste": "Potion of Haste II", + "item.minecraft.splash_potion.effect.haste": "Splash Potion of Haste", + "item.minecraft.splash_potion.effect.strong_haste": "Splash Potion of Haste II", + "item.minecraft.lingering_potion.effect.haste": "Lingering Potion of Haste", + "item.minecraft.lingering_potion.effect.strong_haste": "Lingering Potion of Haste II", + "item.minecraft.tipped_arrow.effect.haste": "Arrow of Haste", + "item.minecraft.tipped_arrow.effect.strong_haste": "Arrow of Haste II", + "advancements.antarchy.cancel_out.title": "1 - 1 = ?", + "advancements.antarchy.cancel_out.description": "Have Growth and Shrinking active at the same time.", + "entity.antarchy.cheep": "Cheep", + "item.antarchy.cheep": "Cheep", + "item.antarchy.cheep_spawn_egg": "Cheep Spawn Egg", + "entity.antarchy.reverie": "Reverie", + "biome.antarchy.thoraxis": "Thoraxis", + "biome.antarchy.nightmare_wastes": "Nightmare Wastes", + "biome.antarchy.umbral_hills": "Umbral Hills", + "biome.antarchy.lucid_pools": "Lucid Pools", + "biome.antarchy.dream_dunes": "Dream Dunes", + "biome.antarchy.cloud_sea": "Cloud Sea", + "trim_material.antarchy.blood_crystal": "Blood Crystal", + "trim_material.antarchy.nightmare_scale": "Nightmare Scale", + "trim_material.antarchy.uranium": "Uranium", + "trim_material.antarchy.titanium": "Titanium", + "advancements.antarchy.duct_tape.title": "I sawed this boat in half!", + "advancements.antarchy.duct_tape.description": "and fixed it with the power of duct tape!", + "key.categories.antarchy": "Antarchy", + "key.antarchy.brutalfly_flap": "Brutalfly Elytra: Flap", + "advancements.antarchy.shrink_ray_craft.title": "Honey, I Shrunk the Mobs", + "advancements.antarchy.shrink_ray_craft.description": "Craft a Shrink Ray.", + "advancements.antarchy.growth_ray_craft.title": "Go Big or Go Home", + "advancements.antarchy.growth_ray_craft.description": "Craft a Growth Ray.", + "advancements.antarchy.squidzooka_craft.title": "Ink and Destroy", + "advancements.antarchy.squidzooka_craft.description": "Craft a Squidzooka.", + "advancements.antarchy.gravity_gun_craft.title": "Pick Up Artist", + "advancements.antarchy.gravity_gun_craft.description": "Craft a Gravity Gun." } diff --git a/common/src/main/resources/assets/antarchy/models/block/amber_lichen.json b/common/src/main/resources/assets/antarchy/models/block/amber_lichen.json deleted file mode 100644 index e6913b4a..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/amber_lichen.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "antarchy:block/amber_moss/amber_lichen", - "glow_lichen": "antarchy:block/amber_moss/amber_lichen" - }, - "elements": [ - { - "from": [0, 0, 0.1], - "to": [16, 16, 0.1], - "faces": { - "north": { "uv": [16, 0, 0, 16], "texture": "#glow_lichen" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#glow_lichen" } - } - } - ] -} diff --git a/common/src/main/resources/assets/antarchy/models/block/amber_moss_block.json b/common/src/main/resources/assets/antarchy/models/block/amber_moss_block.json deleted file mode 100644 index f3079b40..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/amber_moss_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "antarchy:block/amber_moss/amber_moss_block" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet.json b/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet.json deleted file mode 100644 index 3058b1b5..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/carpet", - "textures": { - "wool": "antarchy:block/amber_moss/amber_moss_carpet" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet_side_small.json b/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet_side_small.json deleted file mode 100644 index 279f1af9..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet_side_small.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/mossy_carpet_side", - "textures": { - "side": "antarchy:block/amber_moss/amber_moss_carpet" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet_side_tall.json b/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet_side_tall.json deleted file mode 100644 index f4bcd957..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/amber_moss_carpet_side_tall.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ambientocclusion": true, - "textures": { - "particle": "#side", - "side": "antarchy:block/amber_moss/amber_moss_carpet" - }, - "elements": [ - { - "from": [0, 0, 0.1], - "to": [16, 16, 0.1], - "shade": true, - "faces": { - "north": {"uv": [16, 0, 0, 16], "texture": "#side"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#side"} - } - } - ] -} diff --git a/common/src/main/resources/assets/antarchy/models/block/bile_vein.json b/common/src/main/resources/assets/antarchy/models/block/bile_vein.json deleted file mode 100644 index 1bbd5a7f..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/bile_vein.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "antarchy:block/bile/bile_vein" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/broodstone.json b/common/src/main/resources/assets/antarchy/models/block/broodstone.json deleted file mode 100644 index b282bd92..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/broodstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "antarchy:block/broodstone/broodstone" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/cavaryn_portal_x.json b/common/src/main/resources/assets/antarchy/models/block/cavaryn_portal_x.json deleted file mode 100644 index c3fbe98d..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/cavaryn_portal_x.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "portal": "antarchy:block/cavaryn_portal", - "particle": "antarchy:block/cavaryn_portal" - }, - "elements": [ - { - "from": [0, 0, 7.5], - "to": [16, 16, 8.5], - "faces": { - "north": { "texture": "#portal" }, - "south": { "texture": "#portal" } - } - } - ] -} diff --git a/common/src/main/resources/assets/antarchy/models/block/cavaryn_portal_z.json b/common/src/main/resources/assets/antarchy/models/block/cavaryn_portal_z.json deleted file mode 100644 index 8f25f81e..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/cavaryn_portal_z.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "portal": "antarchy:block/cavaryn_portal", - "particle": "antarchy:block/cavaryn_portal" - }, - "elements": [ - { - "from": [7.5, 0, 0], - "to": [8.5, 16, 16], - "faces": { - "west": { "texture": "#portal" }, - "east": { "texture": "#portal" } - } - } - ] -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_block.json b/common/src/main/resources/assets/antarchy/models/block/chiten_block.json deleted file mode 100644 index c3d21bb3..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "antarchy:block/chiten_block", - "side": "antarchy:block/chiten_block" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_base.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_base.json deleted file mode 100644 index 5bb4d70a..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_down_base" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_frustum.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_frustum.json deleted file mode 100644 index c94fcdb5..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_frustum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_down_frustum" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_middle.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_middle.json deleted file mode 100644 index 8cd7d902..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_middle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_down_middle" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_tip.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_tip.json deleted file mode 100644 index d8b89d9b..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_tip.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_down_tip" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_tip_merge.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_tip_merge.json deleted file mode 100644 index 3941f02d..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_down_tip_merge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_down_tip_merge" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_base.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_base.json deleted file mode 100644 index a896ccbb..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_up_base" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_frustum.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_frustum.json deleted file mode 100644 index e3e84f52..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_frustum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_up_frustum" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_middle.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_middle.json deleted file mode 100644 index ba4e46f2..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_middle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_up_middle" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_tip.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_tip.json deleted file mode 100644 index 25dda590..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_tip.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_up_tip" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_tip_merge.json b/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_tip_merge.json deleted file mode 100644 index 6349e79a..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/chiten_spike_up_tip_merge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pointed_dripstone", - "textures": { - "cross": "antarchy:block/chiten_spike/chiten_spike_up_tip_merge" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_1.json b/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_1.json deleted file mode 100644 index f4187644..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_turtle_egg", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_2.json b/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_2.json deleted file mode 100644 index d2f9f14d..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_two_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_3.json b/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_3.json deleted file mode 100644 index ef956bbe..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_three_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_4.json b/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_4.json deleted file mode 100644 index e5ba6281..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg", - "particle": "antarchy:block/creeping_horror_egg/creeping_horror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/creepvine.json b/common/src/main/resources/assets/antarchy/models/block/creepvine.json deleted file mode 100644 index 3ee3bc66..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/creepvine.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "antarchy:block/creepvine", - "vine": "antarchy:block/creepvine" - }, - "elements": [ - { - "from": [0, 0, 0.8], - "to": [16, 16, 0.8], - "shade": false, - "faces": { - "north": { "uv": [16, 0, 0, 16], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [0, 0, 16, 16], "texture": "#vine", "tintindex": 0 } - } - } - ] -} diff --git a/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_1.json b/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_1.json deleted file mode 100644 index a63af561..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_turtle_egg", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_2.json b/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_2.json deleted file mode 100644 index 71eec9e4..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_two_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_3.json b/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_3.json deleted file mode 100644 index 7e5d23e4..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_three_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_4.json b/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_4.json deleted file mode 100644 index 30d35294..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg", - "particle": "antarchy:block/lurking_terror_egg/lurking_terror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/myrmite.json b/common/src/main/resources/assets/antarchy/models/block/myrmite.json deleted file mode 100644 index 1c17e6da..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/myrmite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "antarchy:block/myrmite" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_1.json b/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_1.json deleted file mode 100644 index 20b6a8ae..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_turtle_egg", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_2.json b/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_2.json deleted file mode 100644 index cbfa51e2..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_two_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_3.json b/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_3.json deleted file mode 100644 index 03be473f..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_three_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_4.json b/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_4.json deleted file mode 100644 index a3863d21..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked", - "particle": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_1.json b/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_1.json deleted file mode 100644 index 7c3dc843..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_turtle_egg", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_2.json b/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_2.json deleted file mode 100644 index 5e296fad..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_two_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_3.json b/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_3.json deleted file mode 100644 index 7f1c780e..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_three_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_4.json b/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_4.json deleted file mode 100644 index 884cc982..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked", - "particle": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/termite_nest.json b/common/src/main/resources/assets/antarchy/models/block/termite_nest.json deleted file mode 100644 index 1bc0e245..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/termite_nest.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "antarchy:block/brown_ant_nest/brown_ant_nest", - "down": "minecraft:block/coarse_dirt", - "up": "antarchy:block/brown_ant_nest/brown_ant_nest_top", - "north": "antarchy:block/brown_ant_nest/brown_ant_nest", - "south": "antarchy:block/brown_ant_nest/brown_ant_nest", - "west": "antarchy:block/brown_ant_nest/brown_ant_nest", - "east": "antarchy:block/brown_ant_nest/brown_ant_nest" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_1.json b/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_1.json deleted file mode 100644 index 4ccfd5ca..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_turtle_egg", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_2.json b/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_2.json deleted file mode 100644 index 37334cc9..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_two_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_3.json b/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_3.json deleted file mode 100644 index 824df80f..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_three_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_4.json b/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_4.json deleted file mode 100644 index 71494d84..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked", - "particle": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_1.json b/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_1.json deleted file mode 100644 index 248b4d18..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_turtle_egg", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_2.json b/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_2.json deleted file mode 100644 index 0ac42d62..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_two_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_3.json b/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_3.json deleted file mode 100644 index 40a9f01b..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_three_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_4.json b/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_4.json deleted file mode 100644 index c4e1dca5..00000000 --- a/common/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked", - "particle": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/item/amber_lichen.json b/common/src/main/resources/assets/antarchy/models/item/amber_lichen.json deleted file mode 100644 index 809509a9..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/amber_lichen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "antarchy:block/amber_moss/amber_lichen" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/item/amber_moss_block.json b/common/src/main/resources/assets/antarchy/models/item/amber_moss_block.json deleted file mode 100644 index 7507fc94..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/amber_moss_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "antarchy:block/amber_moss_block" -} diff --git a/common/src/main/resources/assets/antarchy/models/item/amber_moss_carpet.json b/common/src/main/resources/assets/antarchy/models/item/amber_moss_carpet.json deleted file mode 100644 index 900da03b..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/amber_moss_carpet.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "antarchy:block/amber_moss_carpet" -} diff --git a/common/src/main/resources/assets/antarchy/models/item/bile_vein.json b/common/src/main/resources/assets/antarchy/models/item/bile_vein.json deleted file mode 100644 index 1a1067eb..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/bile_vein.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "antarchy:block/bile_vein" -} diff --git a/common/src/main/resources/assets/antarchy/models/item/broodstone.json b/common/src/main/resources/assets/antarchy/models/item/broodstone.json deleted file mode 100644 index c212825a..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/broodstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "antarchy:block/broodstone" -} diff --git a/common/src/main/resources/assets/antarchy/models/item/chiten.json b/common/src/main/resources/assets/antarchy/models/item/chiten.json deleted file mode 100644 index 20b2e019..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/chiten.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "antarchy:item/chiten" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/item/chiten_block.json b/common/src/main/resources/assets/antarchy/models/item/chiten_block.json deleted file mode 100644 index 47e06517..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/chiten_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "antarchy:block/chiten_block" -} diff --git a/common/src/main/resources/assets/antarchy/models/item/chiten_spike.json b/common/src/main/resources/assets/antarchy/models/item/chiten_spike.json deleted file mode 100644 index 0a70c0e9..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/chiten_spike.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "antarchy:item/chiten_spike" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/item/creeping_horror_egg.json b/common/src/main/resources/assets/antarchy/models/item/creeping_horror_egg.json deleted file mode 100644 index 09dddc04..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/creeping_horror_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "antarchy:item/creeping_horror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/item/creepvine.json b/common/src/main/resources/assets/antarchy/models/item/creepvine.json deleted file mode 100644 index bea911f8..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/creepvine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "antarchy:block/creepvine" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/item/spit_bug_spawn_egg.json b/common/src/main/resources/assets/antarchy/models/item/glimmer_spawn_egg.json similarity index 100% rename from common/src/main/resources/assets/antarchy/models/item/spit_bug_spawn_egg.json rename to common/src/main/resources/assets/antarchy/models/item/glimmer_spawn_egg.json diff --git a/common/src/main/resources/assets/antarchy/models/item/lurking_terror_egg.json b/common/src/main/resources/assets/antarchy/models/item/lurking_terror_egg.json deleted file mode 100644 index 42cebd01..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/lurking_terror_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "antarchy:item/lurking_terror_egg" - } -} diff --git a/common/src/main/resources/assets/antarchy/models/item/myrmite.json b/common/src/main/resources/assets/antarchy/models/item/myrmite.json deleted file mode 100644 index 9da582d2..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/myrmite.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "antarchy:block/myrmite" -} diff --git a/common/src/main/resources/assets/antarchy/models/item/termite_nest.json b/common/src/main/resources/assets/antarchy/models/item/termite_nest.json deleted file mode 100644 index 0f2c65eb..00000000 --- a/common/src/main/resources/assets/antarchy/models/item/termite_nest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "antarchy:block/termite_nest" -} diff --git a/common/src/main/resources/assets/antarchy/sounds.json b/common/src/main/resources/assets/antarchy/sounds.json index 698e1e6f..3987f11c 100644 --- a/common/src/main/resources/assets/antarchy/sounds.json +++ b/common/src/main/resources/assets/antarchy/sounds.json @@ -1,1882 +1,1805 @@ { - "squidzooka_fire": { - "subtitle": "subtitles.antarchy.squidzooka_fire", - "sounds": [ - { - "name": "antarchy:squidzooka/squizooka1" - }, - { - "name": "antarchy:squidzooka/squizooka2" - }, - { - "name": "antarchy:squidzooka/squizooka3" - }, - { - "name": "antarchy:squidzooka/squizooka4" - } - ] - }, - "shrink_ray": { - "subtitle": "subtitles.antarchy.shrink_ray", - "sounds": [ - { - "name": "antarchy:size_ray/shrink_ray" - } - ] - }, - "growth_ray": { - "subtitle": "subtitles.antarchy.growth_ray", - "sounds": [ - { - "name": "antarchy:size_ray/growth_ray" - } - ] - }, - "size_ray_charge": { - "subtitle": "subtitles.antarchy.size_ray_charge", - "sounds": [ - { - "name": "antarchy:size_ray/size_ray_charge" - } - ] - }, - "ant_ambient": { - "subtitle": "subtitles.antarchy.ant_ambient", - "sounds": [ - { - "name": "antarchy:mob/ant/ant_ambient" - } - ] - }, - "ant_idle": { - "subtitle": "subtitles.antarchy.ant_idle", - "sounds": [ - { - "name": "antarchy:mob/ant/ant_idle1" - }, - { - "name": "antarchy:mob/ant/ant_idle2" - }, - { - "name": "antarchy:mob/ant/ant_idle3" - }, - { - "name": "antarchy:mob/ant/ant_idle4" - }, - { - "name": "antarchy:mob/ant/ant_idle5" - }, - { - "name": "antarchy:mob/ant/ant_idle6" - } - ] - }, - "ant_hurt": { - "subtitle": "subtitles.antarchy.ant_hurt", - "sounds": [ - { - "name": "antarchy:mob/ant/ant_hurt" - } - ] - }, - "ant_bite": { - "subtitle": "subtitles.antarchy.ant_bite", - "sounds": [ - { - "name": "antarchy:mob/ant/ant_bite" - } - ] - }, - "ant_gather": { - "subtitle": "subtitles.antarchy.ant_gather", - "sounds": [ - { - "name": "antarchy:mob/ant/ant_gather1" - }, - { - "name": "antarchy:mob/ant/ant_gather2" - } - ] - }, - "ant_nest": { - "subtitle": "subtitles.antarchy.ant_nest", - "sounds": [ - { - "name": "antarchy:block/ant_nest_exit" - } - ] - }, - "cloud_shark_bite": { - "subtitle": "subtitles.antarchy.cloud_shark_bite", - "sounds": [ - { - "name": "antarchy:mob/cloud_shark/cloud_shark_bite" - } - ] - }, - "cloud_shark_idle": { - "subtitle": "subtitles.antarchy.cloud_shark_idle", - "sounds": [ - { - "name": "antarchy:mob/cloud_shark/cloud_shark_idle1" - }, - { - "name": "antarchy:mob/cloud_shark/cloud_shark_idle2" - }, - { - "name": "antarchy:mob/cloud_shark/cloud_shark_idle3" - }, - { - "name": "antarchy:mob/cloud_shark/cloud_shark_idle4" - } - ] - }, - "cloud_shark_hurt": { - "subtitle": "subtitles.antarchy.cloud_shark_hurt", - "sounds": [ - { - "name": "antarchy:mob/cloud_shark/cloud_shark_hurt" - } - ] - }, - "cloud_shark_death": { - "subtitle": "subtitles.antarchy.cloud_shark_death", - "sounds": [ - { - "name": "antarchy:mob/cloud_shark/cloud_shark_death" - } - ] - }, - "cloud_shark_fly": { - "subtitle": "subtitles.antarchy.cloud_shark_fly", - "sounds": [ - { - "name": "antarchy:mob/cloud_shark/cloud_shark_fly1" - } - ] - }, - "caterpillar_idle": { - "subtitle": "subtitles.antarchy.caterpillar_idle", - "sounds": [ - { - "name": "antarchy:mob/caterpillar/caterpillar_idle1" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_idle2" - } - ] - }, - "caterpillar_hurt": { - "subtitle": "subtitles.antarchy.caterpillar_hurt", - "sounds": [ - { - "name": "antarchy:mob/caterpillar/caterpillar_hurt1" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_hurt2" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_hurt3" - } - ] - }, - "caterpillar_crawl": { - "subtitle": "subtitles.antarchy.caterpillar_crawl", - "sounds": [ - { - "name": "antarchy:mob/caterpillar/caterpillar_crawl1" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_crawl2" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_crawl3" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_crawl4" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_crawl5" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_crawl6" - } - ] - }, - "butterfly_hurt": { - "subtitle": "subtitles.antarchy.butterfly_hurt", - "sounds": [ - { - "name": "antarchy:mob/caterpillar/caterpillar_hurt1" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_hurt2" - }, - { - "name": "antarchy:mob/caterpillar/caterpillar_hurt3" - } - ] - }, - "brutalfly_idle": { - "subtitle": "subtitles.antarchy.brutalfly_idle", - "sounds": [ - { - "name": "antarchy:mob/brutalfly/brutalfly_idle1" - }, - { - "name": "antarchy:mob/brutalfly/brutalfly_idle2" - }, - { - "name": "antarchy:mob/brutalfly/brutalfly_idle3" - } - ] - }, - "brutalfly_death": { - "subtitle": "subtitles.antarchy.brutalfly_death", - "sounds": [ - { - "name": "antarchy:mob/brutalfly/brutalfly_death1" - } - ] - }, - "missile_squid_ambient": { - "subtitle": "subtitles.antarchy.missile_squid_ambient", - "sounds": [ - { - "name": "entity.squid.ambient", - "type": "event" - } - ] - }, - "missile_squid_hurt": { - "subtitle": "subtitles.antarchy.missile_squid_hurt", - "sounds": [ - { - "name": "entity.squid.hurt", - "type": "event" - } - ] - }, - "missile_squid_death": { - "subtitle": "subtitles.antarchy.missile_squid_death", - "sounds": [ - { - "name": "entity.squid.death", - "type": "event" - } - ] - }, - "missile_squid_attack": { - "subtitle": "subtitles.antarchy.missile_squid_attack", - "sounds": [ - { - "name": "antarchy:mob/missile_squid/missile_squid_attack1" - }, - { - "name": "antarchy:mob/missile_squid/missile_squid_attack2" - }, - { - "name": "antarchy:mob/missile_squid/missile_squid_attack3" - } - ] - }, - "kraken_flying_loop": { - "subtitle": "subtitles.antarchy.kraken_flying_loop", - "sounds": [ - { - "name": "antarchy:mob/kraken/kraken_flying_loop1", - "stream": true - }, - { - "name": "antarchy:mob/kraken/kraken_flying_loop2", - "stream": true - } - ] - }, - "kraken_flying_sideways_loop": { - "subtitle": "subtitles.antarchy.kraken_flying_sideways_loop", - "sounds": [ - { - "name": "antarchy:mob/kraken/kraken_flying_sideways_loop1", - "stream": true - }, - { - "name": "antarchy:mob/kraken/kraken_flying_sideways_loop2", - "stream": true - } - ] - }, - "kraken_attack": { - "subtitle": "subtitles.antarchy.kraken_attack", - "sounds": [ - { - "name": "antarchy:mob/kraken/kraken_attack1" - } - ] - }, - "kraken_spin": { - "subtitle": "subtitles.antarchy.kraken_spin", - "sounds": [ - { - "name": "antarchy:mob/kraken/kraken_spin" - } - ] - }, - "kraken_roar": { - "subtitle": "subtitles.antarchy.kraken_roar", - "sounds": [ - { - "name": "antarchy:mob/kraken/kraken_roar" - } - ] - }, - "kraken_summon": { - "subtitle": "subtitles.antarchy.kraken_summon", - "sounds": [ - { - "name": "antarchy:mob/kraken/kraken_spawn" - } - ] - }, - "kraken_hurt": { - "subtitle": "subtitles.antarchy.kraken_hurt", - "sounds": [ - { - "name": "antarchy:mob/kraken/kraken_hurt1" - }, - { - "name": "antarchy:mob/kraken/kraken_hurt2" - } - ] - }, - "kraken_death": { - "subtitle": "subtitles.antarchy.kraken_death", - "sounds": [ - { - "name": "antarchy:mob/kraken/kraken_death" - } - ] - }, - "basilisk_idle_loop": { - "subtitle": "subtitles.antarchy.basilisk_idle_loop", - "sounds": [ - { - "name": "antarchy:mob/basilisk/basilisk_idle_loop1", - "stream": true - }, - { - "name": "antarchy:mob/basilisk/basilisk_idle_loop2", - "stream": true - } - ] - }, - "basilisk_slither_loop": { - "subtitle": "subtitles.antarchy.basilisk_slither_loop", - "sounds": [ - { - "name": "antarchy:mob/basilisk/basilisk_slither_loop1", - "stream": true - }, - { - "name": "antarchy:mob/basilisk/basilisk_slither_loop2", - "stream": true - } - ] - }, - "basilisk_bite": { - "subtitle": "subtitles.antarchy.basilisk_bite", - "sounds": [ - { - "name": "antarchy:mob/basilisk/basilisk_bite" - } - ] - }, - "basilisk_hiss": { - "subtitle": "subtitles.antarchy.basilisk_hiss", - "sounds": [ - { - "name": "antarchy:mob/basilisk/basilisk_hiss" - } - ] - }, - "basilisk_hurt": { - "subtitle": "subtitles.antarchy.basilisk_hurt", - "sounds": [ - { - "name": "antarchy:mob/basilisk/basilisk_hurt1" - }, - { - "name": "antarchy:mob/basilisk/basilisk_hurt2" - } - ] - }, - "basilisk_death": { - "subtitle": "subtitles.antarchy.basilisk_death", - "sounds": [ - { - "name": "antarchy:mob/basilisk/basilisk_death" - } - ] - }, - "bomber_walk": { - "subtitle": "subtitles.antarchy.bomber_walk", - "sounds": [ - { - "name": "antarchy:mob/bomber/walk1" - }, - { - "name": "antarchy:mob/bomber/walk2" - }, - { - "name": "antarchy:mob/bomber/walk3" - }, - { - "name": "antarchy:mob/bomber/walk4" - } - ] - }, - "bomber_knock": { - "subtitle": "subtitles.antarchy.bomber_knock", - "sounds": [ - { - "name": "antarchy:mob/bomber/knock1" - }, - { - "name": "antarchy:mob/bomber/knock2" - }, - { - "name": "antarchy:mob/bomber/knock3" - }, - { - "name": "antarchy:mob/bomber/knock4" - }, - { - "name": "antarchy:mob/bomber/knock5" - } - ] - }, - "bomber_explode": { - "subtitle": "subtitles.antarchy.bomber_explode", - "sounds": [ - { - "name": "antarchy:mob/bomber/explode1" - }, - { - "name": "antarchy:mob/bomber/explode2" - } - ] - }, - "toreterror_idle": { - "subtitle": "subtitles.antarchy.toreterror_idle", - "sounds": [ - { - "name": "antarchy:mob/toreterror/idle1" - }, - { - "name": "antarchy:mob/toreterror/idle2" - }, - { - "name": "antarchy:mob/toreterror/idle3" - } - ] - }, - "toreterror_hurt": { - "subtitle": "subtitles.antarchy.toreterror_hurt", - "sounds": [ - { - "name": "antarchy:mob/toreterror/hurt1" - }, - { - "name": "antarchy:mob/toreterror/hurt2" - }, - { - "name": "antarchy:mob/toreterror/hurt3" - } - ] - }, - "toreterror_death": { - "subtitle": "subtitles.antarchy.toreterror_death", - "sounds": [ - { - "name": "antarchy:mob/toreterror/death" - } - ] - }, - "toreterror_bomber_fire": { - "subtitle": "subtitles.antarchy.toreterror_bomber_fire", - "sounds": [ - { - "name": "antarchy:mob/toreterror/bomber_fire1" - }, - { - "name": "antarchy:mob/toreterror/bomber_fire2" - } - ] - }, - "toreterror_spin": { - "subtitle": "subtitles.antarchy.toreterror_spin", - "sounds": [ - { - "name": "antarchy:mob/toreterror/spin" - } - ] - }, - "toreterror_ricochet": { - "subtitle": "subtitles.antarchy.toreterror_ricochet", - "sounds": [ - { - "name": "antarchy:mob/toreterror/richochet1" - }, - { - "name": "antarchy:mob/toreterror/richochet2" - }, - { - "name": "antarchy:mob/toreterror/richochet3" - } - ] - }, - "water_cannon_fire": { - "subtitle": "subtitles.antarchy.water_cannon_fire", - "sounds": [ - { - "name": "antarchy:mob/toreterror/water_cannon1" - }, - { - "name": "antarchy:mob/toreterror/water_cannon2" - }, - { - "name": "antarchy:mob/toreterror/water_cannon3" - }, - { - "name": "antarchy:mob/toreterror/water_cannon4" - } - ] - }, - "toreterror_jump_up": { - "subtitle": "subtitles.antarchy.toreterror_jump_up", - "sounds": [ - { - "name": "antarchy:mob/toreterror/jump_up1" - }, - { - "name": "antarchy:mob/toreterror/jump_up2" - } - ] - }, - "toreterror_jump_land": { - "subtitle": "subtitles.antarchy.toreterror_jump_land", - "sounds": [ - { - "name": "antarchy:mob/toreterror/jump_land1" - }, - { - "name": "antarchy:mob/toreterror/jump_land2" - } - ] - }, - "creeping_horror_growl": { - "subtitle": "subtitles.antarchy.creeping_horror_growl", - "sounds": [ - { - "name": "antarchy:mob/creeping_horror/creeping_horror_growl1" - }, - { - "name": "antarchy:mob/creeping_horror/creeping_horror_growl2" - } - ] - }, - "creeping_horror_hurt": { - "subtitle": "subtitles.antarchy.creeping_horror_hurt", - "sounds": [ - { - "name": "antarchy:mob/creeping_horror/creeping_horror_hurt1" - }, - { - "name": "antarchy:mob/creeping_horror/creeping_horror_hurt2" - } - ] - }, - "creeping_horror_bite": { - "subtitle": "subtitles.antarchy.creeping_horror_bite", - "sounds": [ - { - "name": "antarchy:mob/creeping_horror/creeping_horror_bite1" - }, - { - "name": "antarchy:mob/creeping_horror/creeping_horror_bite2" - }, - { - "name": "antarchy:mob/creeping_horror/creeping_horror_bite3" - }, - { - "name": "antarchy:mob/creeping_horror/creeping_horror_bite4" - } - ] - }, - "lurking_terror_snarl": { - "subtitle": "subtitles.antarchy.lurking_terror_snarl", - "sounds": [ - { - "name": "antarchy:mob/lurking_terror/lurking_terror_snarl1" - }, - { - "name": "antarchy:mob/lurking_terror/lurking_terror_snarl2" - } - ] - }, - "lurking_terror_hurt": { - "subtitle": "subtitles.antarchy.lurking_terror_hurt", - "sounds": [ - { - "name": "antarchy:mob/lurking_terror/lurking_terror_hurt1" - }, - { - "name": "antarchy:mob/lurking_terror/lurking_terror_hurt2" - } - ] - }, - "lurking_terror_bite": { - "subtitle": "subtitles.antarchy.lurking_terror_bite", - "sounds": [ - { - "name": "antarchy:mob/lurking_terror/lurking_terror_bite1" - } - ] - }, - "lurking_terror_fly_loop": { - "subtitle": "subtitles.antarchy.lurking_terror_fly_loop", - "sounds": [ - { - "name": "antarchy:mob/lurking_terror/lurking_terror_fly_loop" - } - ] - }, - "stinky_fly": { - "subtitle": "subtitles.antarchy.stinky_fly", - "sounds": [ - { - "name": "antarchy:effect/stinky/stinky_flies1" - }, - { - "name": "antarchy:effect/stinky/stinky_flies2" - }, - { - "name": "antarchy:effect/stinky/stinky_flies3" - }, - { - "name": "antarchy:effect/stinky/stinky_flies4" - }, - { - "name": "antarchy:effect/stinky/stinky_flies5" - }, - { - "name": "antarchy:effect/stinky/stinky_flies6" - }, - { - "name": "antarchy:effect/stinky/stinky_flies7" - }, - { - "name": "antarchy:effect/stinky/stinky_flies8" - } - ] - }, - "thoraxis_nightmare_wastes_ambient": { - "subtitle": "subtitles.antarchy.thoraxis_nightmare_wastes_ambient", - "sounds": [ - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/ambience_reversed", - "volume": 0.28, - "weight": 4 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/dark1_reversed", - "volume": 0.24, - "weight": 2 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/dark2_reversed", - "volume": 0.24, - "weight": 2 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/ground1_reversed", - "volume": 0.2, - "weight": 1 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/ground2_reversed", - "volume": 0.2, - "weight": 1 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/ground3_reversed", - "volume": 0.2, - "weight": 1 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/ground4_reversed", - "volume": 0.2, - "weight": 1 - } - ] - }, - "thoraxis_nightmare_wastes_additions": { - "subtitle": "subtitles.antarchy.thoraxis_nightmare_wastes_additions", - "sounds": [ - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition1_reversed", - "volume": 0.6 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition2_reversed", - "volume": 0.6 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition3_reversed", - "volume": 0.6 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition4_reversed", - "volume": 0.6 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition5_reversed", - "volume": 0.6 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition6_reversed", - "volume": 0.6 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition7_reversed", - "volume": 0.6 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition8_reversed", - "volume": 0.6 - } - ] - }, - "thoraxis_nightmare_wastes_mood": { - "subtitle": "subtitles.antarchy.thoraxis_nightmare_wastes_mood", - "sounds": [ - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood1_reversed", - "volume": 0.5 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood2_reversed", - "volume": 0.5 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood3_reversed", - "volume": 0.5 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood4_reversed", - "volume": 0.5 - }, - { - "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood5_reversed", - "volume": 0.5 - } - ] - }, - "thoraxis_dream_dunes_ambient": { - "subtitle": "subtitles.antarchy.thoraxis_dream_dunes_ambient", - "sounds": [ - { - "name": "antarchy:ambient/thoraxis/dream_dunes/wind1_reversed", - "volume": 0.3, - "weight": 3 - }, - { - "name": "antarchy:ambient/thoraxis/dream_dunes/wind2_reversed", - "volume": 0.3, - "weight": 3 - }, - { - "name": "antarchy:ambient/thoraxis/dream_dunes/wind3_reversed", - "volume": 0.3, - "weight": 3 - }, - { - "name": "antarchy:ambient/thoraxis/dream_dunes/wind4_reversed", - "volume": 0.3, - "weight": 3 - }, - { - "name": "antarchy:ambient/thoraxis/dream_dunes/with1_reversed", - "volume": 0.24, - "weight": 2 - } - ] - }, - "thoraxis_dream_dunes_additions": { - "subtitle": "subtitles.antarchy.thoraxis_dream_dunes_additions", - "sounds": [ - { - "name": "ambient/nether/soulsand_valley/sand1", - "volume": 0.65, - "weight": 3 - }, - { - "name": "ambient/nether/soulsand_valley/sand2", - "volume": 0.65, - "weight": 3 - }, - { - "name": "ambient/nether/soulsand_valley/sand3", - "volume": 0.65, - "weight": 3 - }, - { - "name": "ambient/nether/soulsand_valley/ambience", - "volume": 0.5, - "weight": 2 - }, - { - "name": "ambient/nether/soulsand_valley/mood1", - "volume": 0.45, - "weight": 1 - }, - { - "name": "ambient/nether/soulsand_valley/mood2", - "volume": 0.45, - "weight": 1 - } - ] - }, - "thoraxis_dream_dunes_mood": { - "subtitle": "subtitles.antarchy.thoraxis_dream_dunes_mood", - "sounds": [ - { - "name": "ambient/nether/soulsand_valley/mood1", - "volume": 0.45, - "weight": 2 - }, - { - "name": "ambient/nether/soulsand_valley/mood2", - "volume": 0.45, - "weight": 2 - } - ] - }, - "thoraxis_lucid_pools_ambient": { - "subtitle": "subtitles.antarchy.thoraxis_lucid_pools_ambient", - "sounds": [ - { - "name": "antarchy:ambient/thoraxis/lucid_pools/ambient", - "volume": 0.26, - "weight": 4 - } - ] - }, - "thoraxis_lucid_pools_additions": { - "subtitle": "subtitles.antarchy.thoraxis_lucid_pools_additions", - "sounds": [ - { - "name": "antarchy:ambient/thoraxis/lucid_pools/curse1", - "volume": 0.48 - }, - { - "name": "antarchy:ambient/thoraxis/lucid_pools/curse2", - "volume": 0.48 - }, - { - "name": "antarchy:ambient/thoraxis/lucid_pools/curse3", - "volume": 0.48 - }, - { - "name": "antarchy:ambient/thoraxis/lucid_pools/curse4", - "volume": 0.48 - } - ] - }, - "thoraxis_lucid_pools_mood": { - "subtitle": "subtitles.antarchy.thoraxis_lucid_pools_mood", - "sounds": [ - { - "name": "ambient/nether/soulsand_valley/mood1", - "volume": 0.45, - "weight": 2 - }, - { - "name": "ambient/nether/soulsand_valley/mood2", - "volume": 0.45, - "weight": 2 - } - ] - }, - "lucid_ambient": { - "subtitle": "subtitles.antarchy.lucid_ambient", - "sounds": [ - { - "name": "antarchy:mob/lucid/lucid_ambience", - "stream": true - } - ] - }, - "lucid_flying": { - "subtitle": "subtitles.antarchy.lucid_flying", - "sounds": [ - { - "name": "antarchy:mob/lucid/lucid_flying", - "stream": true - } - ] - }, - "lucid_attack": { - "subtitle": "subtitles.antarchy.lucid_attack", - "sounds": [ - { - "name": "antarchy:mob/lucid/lucid_attack" - } - ] - }, - "lucid_bolt": { - "subtitle": "subtitles.antarchy.lucid_bolt", - "sounds": [ - { - "name": "antarchy:mob/lucid/lucid_bolt" - } - ] - }, - "lucid_hurt": { - "subtitle": "subtitles.antarchy.lucid_hurt", - "sounds": [ - { - "name": "antarchy:mob/lucid/lucid_hurt1" - }, - { - "name": "antarchy:mob/lucid/lucid_hurt2" - } - ] - }, - "lucid_death": { - "subtitle": "subtitles.antarchy.lucid_death", - "sounds": [ - { - "name": "antarchy:mob/lucid/lucid_death" - } - ] - }, - "reverie_idle": { - "subtitle": "subtitles.antarchy.reverie_idle", - "sounds": [ - { - "name": "antarchy:mob/reverie/reverie_idle1", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_idle2", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_idle3", - "volume": 0.5 - } - ] - }, - "reverie_hurt": { - "subtitle": "subtitles.antarchy.reverie_hurt", - "sounds": [ - { - "name": "antarchy:mob/reverie/reverie_hurt1", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_hurt2", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_hurt3", - "volume": 0.5 - } - ] - }, - "reverie_worry": { - "subtitle": "subtitles.antarchy.reverie_worry", - "sounds": [ - { - "name": "antarchy:mob/reverie/reverie_worry1", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_worry2", - "volume": 0.5 - } - ] - }, - "reverie_save": { - "subtitle": "subtitles.antarchy.reverie_save", - "sounds": [ - { - "name": "antarchy:mob/reverie/reverie_save1", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_save2", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_save3", - "volume": 0.5 - } - ] - }, - "reverie_join_player": { - "subtitle": "subtitles.antarchy.reverie_join_player", - "sounds": [ - { - "name": "antarchy:mob/reverie/reverie_joinplayer1", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_joinplayer2", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_joinplayer3", - "volume": 0.5 - } - ] - }, - "reverie_alert": { - "subtitle": "subtitles.antarchy.reverie_alert", - "sounds": [ - { - "name": "antarchy:mob/reverie/reverie_alert1", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_alert2", - "volume": 0.5 - }, - { - "name": "antarchy:mob/reverie/reverie_alert3", - "volume": 0.5 - } - ] - }, - "flying_squirrel_idle": { - "subtitle": "subtitles.antarchy.flying_squirrel_idle", - "sounds": [ - { - "name": "antarchy:mob/flying_squirrel/flying_squirrel_idle1" - }, - { - "name": "minecraft:mob/fox/sniff1" - }, - { - "name": "minecraft:mob/fox/sniff2" - }, - { - "name": "minecraft:mob/fox/sniff4" - } - ] - }, - "flying_squirrel_beg": { - "subtitle": "subtitles.antarchy.flying_squirrel_beg", - "sounds": [ - { - "name": "entity.cat.beg_for_food", - "type": "event" - } - ] - }, - "flying_squirrel_nut": { - "subtitle": "subtitles.antarchy.flying_squirrel_nut", - "sounds": [ - { - "name": "minecraft:mob/fox/eat1" - }, - { - "name": "minecraft:mob/fox/eat2" - }, - { - "name": "minecraft:mob/fox/eat3" - } - ] - }, - "flying_squirrel_glide_loop": { - "subtitle": "subtitles.antarchy.flying_squirrel_glide_loop", - "sounds": [ - { - "name": "antarchy:mob/flying_squirrel/flying_squirrel_glide_loop" - } - ] - }, - "flying_squirrel_hurt": { - "subtitle": "subtitles.antarchy.flying_squirrel_hurt", - "sounds": [ - { - "name": "minecraft:mob/fox/hurt1" - }, - { - "name": "minecraft:mob/fox/hurt2" - }, - { - "name": "minecraft:mob/fox/hurt3" - }, - { - "name": "minecraft:mob/fox/hurt4" - } - ] - }, - "flying_squirrel_death": { - "subtitle": "subtitles.antarchy.flying_squirrel_death", - "sounds": [ - { - "name": "minecraft:mob/fox/death1" - }, - { - "name": "minecraft:mob/fox/death2" - } - ] - }, - "nightmare_idle": { - "subtitle": "subtitles.antarchy.nightmare_idle", - "sounds": [ - { - "name": "antarchy:mob/nightmare/nightmare_idle1" - }, - { - "name": "antarchy:mob/nightmare/nightmare_idle2" - }, - { - "name": "antarchy:mob/nightmare/nightmare_idle3" - }, - { - "name": "antarchy:mob/nightmare/nightmare_idle4" - } - ] - }, - "nightmare_hurt": { - "subtitle": "subtitles.antarchy.nightmare_hurt", - "sounds": [ - { - "name": "antarchy:mob/nightmare/nightmare_hurt1" - } - ] - }, - "nightmare_roar": { - "subtitle": "subtitles.antarchy.nightmare_roar", - "sounds": [ - { - "name": "antarchy:mob/nightmare/nightmare_roar1" - }, - { - "name": "antarchy:mob/nightmare/nightmare_roar2" - } - ] - }, - "nightmare_death": { - "subtitle": "subtitles.antarchy.nightmare_death", - "sounds": [ - { - "name": "antarchy:mob/nightmare/nightmare_death" - } - ] - }, - "nightmare_bite": { - "subtitle": "subtitles.antarchy.nightmare_bite", - "sounds": [ - { - "name": "minecraft:mob/phantom/bite1" - }, - { - "name": "minecraft:mob/phantom/bite2" - } - ] - }, - "nightmare_flap": { - "subtitle": "subtitles.antarchy.nightmare_flap", - "sounds": [ - { - "name": "minecraft:mob/enderdragon/wings1" - }, - { - "name": "minecraft:mob/enderdragon/wings2" - }, - { - "name": "minecraft:mob/enderdragon/wings3" - }, - { - "name": "minecraft:mob/enderdragon/wings4" - }, - { - "name": "minecraft:mob/enderdragon/wings5" - }, - { - "name": "minecraft:mob/enderdragon/wings6" - } - ] - }, - "mantis_ambient": { - "subtitle": "subtitles.antarchy.mantis_ambient", - "sounds": [ - { - "name": "antarchy:mob/mantis/mantis_idle1" - }, - { - "name": "antarchy:mob/mantis/mantis_idle2" - }, - { - "name": "antarchy:mob/mantis/mantis_idle3" - }, - { - "name": "antarchy:mob/mantis/mantis_idle4" - }, - { - "name": "antarchy:mob/mantis/mantis_idle5" - }, - { - "name": "antarchy:mob/mantis/mantis_idle6" - }, - { - "name": "antarchy:mob/mantis/mantis_idle7" - } - ] - }, - "mantis_hurt": { - "subtitle": "subtitles.antarchy.mantis_hurt", - "sounds": [ - { - "name": "antarchy:mob/mantis/mantis_hurt1" - }, - { - "name": "antarchy:mob/mantis/mantis_hurt2" - }, - { - "name": "antarchy:mob/mantis/mantis_hurt3" - } - ] - }, - "mantis_attack": { - "subtitle": "subtitles.antarchy.mantis_attack", - "sounds": [ - { - "name": "antarchy:mob/mantis/mantis_attack1" - }, - { - "name": "antarchy:mob/mantis/mantis_attack2" - }, - { - "name": "antarchy:mob/mantis/mantis_attack3" - }, - { - "name": "antarchy:mob/mantis/mantis_attack4" - } - ] - }, - "mantis_fly_loop": { - "subtitle": "subtitles.antarchy.mantis_fly_loop", - "sounds": [ - { - "name": "antarchy:mob/mantis/mantis_fly_loop", - "stream": true - } - ] - }, - "gravity_gun_pickup": { - "subtitle": "subtitles.antarchy.gravity_gun_pickup", - "sounds": [ - { - "name": "antarchy:gravity_gun/gravity_gun_pickup" - } - ] - }, - "gravity_gun_drop": { - "subtitle": "subtitles.antarchy.gravity_gun_drop", - "sounds": [ - { - "name": "antarchy:gravity_gun/gravity_gun_drop" - } - ] - }, - "gravity_gun_hold_loop": { - "subtitle": "subtitles.antarchy.gravity_gun_hold_loop", - "sounds": [ - { - "name": "antarchy:gravity_gun/gravity_gun_hold_loop" - } - ] - }, - "gravity_gun_launch": { - "subtitle": "subtitles.antarchy.gravity_gun_launch", - "sounds": [ - { - "name": "antarchy:gravity_gun/gravity_gun_launch1" - }, - { - "name": "antarchy:gravity_gun/gravity_gun_launch2" - }, - { - "name": "antarchy:gravity_gun/gravity_gun_launch3" - }, - { - "name": "antarchy:gravity_gun/gravity_gun_launch4" - } - ] - }, - "gravity_gun_dryfire": { - "subtitle": "subtitles.antarchy.gravity_gun_dryfire", - "sounds": [ - { - "name": "antarchy:gravity_gun/gravity_gun_dryfire" - } - ] - }, - "bed_bug_ambient": { - "subtitle": "subtitles.antarchy.bed_bug_ambient", - "sounds": [ - { - "name": "antarchy:mob/bed_bug/bed_bug_ambient1" - }, - { - "name": "antarchy:mob/bed_bug/bed_bug_ambient2" - } - ] - }, - "bed_bug_hurt": { - "subtitle": "subtitles.antarchy.bed_bug_hurt", - "sounds": [ - { - "name": "antarchy:mob/bed_bug/bed_bug_hurt1" - }, - { - "name": "antarchy:mob/bed_bug/bed_bug_hurt2" - } - ] - }, - "bed_bug_attack": { - "subtitle": "subtitles.antarchy.bed_bug_attack", - "sounds": [ - { - "name": "antarchy:mob/bed_bug/bed_bug_attack1" - } - ] - }, - "wasp_idle": { - "subtitle": "subtitles.antarchy.wasp_idle", - "sounds": [ - { - "name": "antarchy:mob/wasp/buzz1" - }, - { - "name": "antarchy:mob/wasp/buzz2" - } - ] - }, - "wasp_hurt": { - "subtitle": "subtitles.antarchy.wasp_hurt", - "sounds": [ - { - "name": "antarchy:mob/wasp/hurt1" - }, - { - "name": "antarchy:mob/wasp/hurt2" - }, - { - "name": "antarchy:mob/wasp/hurt3" - } - ] - }, - "wasp_attack": { - "subtitle": "subtitles.antarchy.wasp_attack", - "sounds": [ - { - "name": "antarchy:mob/wasp/attack1" - }, - { - "name": "antarchy:mob/wasp/attack2" - }, - { - "name": "antarchy:mob/wasp/attack3" - }, - { - "name": "antarchy:mob/wasp/attack4" - }, - { - "name": "antarchy:mob/wasp/attack5" - } - ] - }, - "wasp_death": { - "subtitle": "subtitles.antarchy.wasp_death", - "sounds": [ - { - "name": "antarchy:mob/wasp/death1" - }, - { - "name": "antarchy:mob/wasp/death2" - } - ] - }, - "scorpion_ambient": { - "subtitle": "subtitles.antarchy.scorpion_ambient", - "sounds": [ - { - "name": "antarchy:mob/scorpion/scorpion_ambient1" - } - ] - }, - "scorpion_hurt": { - "subtitle": "subtitles.antarchy.scorpion_hurt", - "sounds": [ - { - "name": "antarchy:mob/scorpion/scorpion_hurt1" - }, - { - "name": "antarchy:mob/scorpion/scorpion_hurt2" - }, - { - "name": "antarchy:mob/scorpion/scorpion_hurt3" - } - ] - }, - "scorpion_attack": { - "subtitle": "subtitles.antarchy.scorpion_attack", - "sounds": [ - { - "name": "antarchy:mob/scorpion/scorpion_attack1" - }, - { - "name": "antarchy:mob/scorpion/scorpion_attack2" - } - ] - }, - "emperor_scorpion_ambient": { - "subtitle": "subtitles.antarchy.emperor_scorpion_ambient", - "sounds": [ - { - "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_ambient1" - } - ] - }, - "emperor_scorpion_hurt": { - "subtitle": "subtitles.antarchy.emperor_scorpion_hurt", - "sounds": [ - { - "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_hurt1" - }, - { - "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_hurt2" - }, - { - "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_hurt3" - } - ] - }, - "emperor_scorpion_attack": { - "subtitle": "subtitles.antarchy.emperor_scorpion_attack", - "sounds": [ - { - "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_attack1" - } - ] - }, - "emperor_scorpion_roar": { - "subtitle": "subtitles.antarchy.emperor_scorpion_roar", - "sounds": [ - { - "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_roar1" - } - ] - }, - "moleworm_ambient": { - "subtitle": "subtitles.antarchy.moleworm_ambient", - "sounds": [ - { - "name": "antarchy:mob/moleworm/moleworm_idle1" - }, - { - "name": "antarchy:mob/moleworm/moleworm_idle2" - }, - { - "name": "antarchy:mob/moleworm/moleworm_idle3" - }, - { - "name": "antarchy:mob/moleworm/moleworm_idle4" - }, - { - "name": "antarchy:mob/moleworm/moleworm_idle5" - }, - { - "name": "antarchy:mob/moleworm/moleworm_idle6" - }, - { - "name": "antarchy:mob/moleworm/moleworm_idle7" - } - ] - }, - "moleworm_hurt": { - "subtitle": "subtitles.antarchy.moleworm_hurt", - "sounds": [ - { - "name": "antarchy:mob/moleworm/moleworm_hurt1" - }, - { - "name": "antarchy:mob/moleworm/moleworm_hurt2" - }, - { - "name": "antarchy:mob/moleworm/moleworm_hurt3" - } - ] - }, - "moleworm_attack": { - "subtitle": "subtitles.antarchy.moleworm_attack", - "sounds": [ - { - "name": "antarchy:mob/moleworm/moleworm_attack1" - }, - { - "name": "antarchy:mob/moleworm/moleworm_attack2" - } - ] - }, - "moleworm_dig": { - "subtitle": "subtitles.antarchy.moleworm_dig", - "sounds": [ - { - "name": "antarchy:mob/moleworm/moleworm_dig1" - }, - { - "name": "antarchy:mob/moleworm/moleworm_dig2" - }, - { - "name": "antarchy:mob/moleworm/moleworm_dig3" - } - ] - }, - "molevore_ambient": { - "subtitle": "subtitles.antarchy.molevore_ambient", - "sounds": [ - { - "name": "antarchy:mob/molevore/molevore_idle1" - }, - { - "name": "antarchy:mob/molevore/molevore_idle2" - }, - { - "name": "antarchy:mob/molevore/molevore_idle3" - } - ] - }, - "molevore_hurt": { - "subtitle": "subtitles.antarchy.molevore_hurt", - "sounds": [ - { - "name": "antarchy:mob/molevore/molevore_hurt1" - }, - { - "name": "antarchy:mob/molevore/molevore_hurt2" - }, - { - "name": "antarchy:mob/molevore/molevore_hurt3" - } - ] - }, - "molevore_attack": { - "subtitle": "subtitles.antarchy.molevore_attack", - "sounds": [ - { - "name": "antarchy:mob/molevore/molevore_attack1" - }, - { - "name": "antarchy:mob/molevore/molevore_attack2" - }, - { - "name": "antarchy:mob/molevore/molevore_attack3" - } - ] - }, - "molevore_dig": { - "subtitle": "subtitles.antarchy.molevore_dig", - "sounds": [ - { - "name": "antarchy:mob/molevore/molevore_dig1" - } - ] - }, - "duct_tape_use": { - "subtitle": "subtitles.antarchy.duct_tape_use", - "sounds": [ - { - "name": "antarchy:block/duct_tape/duct_tape1" - }, - { - "name": "antarchy:block/duct_tape/duct_tape2" - }, - { - "name": "antarchy:block/duct_tape/duct_tape3" - }, - { - "name": "antarchy:block/duct_tape/duct_tape4" - }, - { - "name": "antarchy:block/duct_tape/duct_tape5" - }, - { - "name": "antarchy:block/duct_tape/duct_tape6" - }, - { - "name": "antarchy:block/duct_tape/duct_tape7" - }, - { - "name": "antarchy:block/duct_tape/duct_tape8" - } - ] - }, - "potent_nyxite_hypnotic_gas": { - "subtitle": "subtitles.antarchy.potent_nyxite_hypnotic_gas", - "sounds": [ - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient1" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient2" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient3" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient4" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient5" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient6" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient7" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient8" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient9" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient10" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient11" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient12" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient13" - }, - { - "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient14" - } - ] - }, - "potent_nyxite_geyser_eruption_start": { - "subtitle": "subtitles.antarchy.potent_nyxite_geyser_eruption", - "sounds": [ - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption1" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption2" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption3" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption4" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption5" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption6" - } - ] - }, - "potent_nyxite_geyser_eruption_active": { - "subtitle": "subtitles.antarchy.potent_nyxite_geyser_eruption", - "sounds": [ - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active1" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active2" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active3" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active4" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active5" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active6" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active7" - } - ] - }, - "potent_nyxite_geyser_continuous_start": { - "subtitle": "subtitles.antarchy.potent_nyxite_geyser_continuous", - "sounds": [ - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption1" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption2" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption3" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption4" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption5" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption6" - } - ] - }, - "potent_nyxite_geyser_continuous_active": { - "subtitle": "subtitles.antarchy.potent_nyxite_geyser_continuous", - "sounds": [ - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active1" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active2" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active3" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active4" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active5" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active6" - }, - { - "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active7" - } - ] - }, - "ambient.elythia.firefly": { - "sounds": [ - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush1", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush2", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush3", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush4", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush5", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush6", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush7", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush8", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush9", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush10", - "stream": false - }, - { - "name": "antarchy:ambient/elythia/firefly/firefly_bush11", - "stream": false - } - ] - }, - "triffid_attack": { - "subtitle": "subtitles.antarchy.triffid_attack", - "sounds": [ - { - "name": "antarchy:mob/triffid/triffid_attack1" - } - ] - }, - "triffid_grab": { - "subtitle": "subtitles.antarchy.triffid_grab", - "sounds": [ - { - "name": "antarchy:mob/triffid/triffid_grab1" - } - ] - }, - "triffid_hurt": { - "subtitle": "subtitles.antarchy.triffid_hurt", - "sounds": [ - { - "name": "antarchy:mob/triffid/triffid_hurt1" - }, - { - "name": "antarchy:mob/triffid/triffid_hurt2" - }, - { - "name": "antarchy:mob/triffid/triffid_hurt3" - } - ] - }, - "triffid_death": { - "subtitle": "subtitles.antarchy.triffid_death", - "sounds": [ - { - "name": "antarchy:mob/triffid/triffid_hurt3" - } - ] - }, - "triffid_hiss": { - "subtitle": "subtitles.antarchy.triffid_hiss", - "sounds": [ - { - "name": "antarchy:mob/triffid/triffid_hiss1" - } - ] - }, - "triffid_growl": { - "subtitle": "subtitles.antarchy.triffid_growl", - "sounds": [ - { - "name": "antarchy:mob/triffid/triffid_growl1" - }, - { - "name": "antarchy:mob/triffid/triffid_growl2" - } - ] - } + "squidzooka_fire": { + "subtitle": "subtitles.antarchy.squidzooka_fire", + "sounds": [ + { + "name": "antarchy:squidzooka/squizooka1" + }, + { + "name": "antarchy:squidzooka/squizooka2" + }, + { + "name": "antarchy:squidzooka/squizooka3" + }, + { + "name": "antarchy:squidzooka/squizooka4" + } + ] + }, + "shrink_ray": { + "subtitle": "subtitles.antarchy.shrink_ray", + "sounds": [ + { + "name": "antarchy:size_ray/shrink_ray" + } + ] + }, + "growth_ray": { + "subtitle": "subtitles.antarchy.growth_ray", + "sounds": [ + { + "name": "antarchy:size_ray/growth_ray" + } + ] + }, + "size_ray_charge": { + "subtitle": "subtitles.antarchy.size_ray_charge", + "sounds": [ + { + "name": "antarchy:size_ray/size_ray_charge" + } + ] + }, + "ant_ambient": { + "subtitle": "subtitles.antarchy.ant_ambient", + "sounds": [ + { + "name": "antarchy:mob/ant/ant_ambient" + } + ] + }, + "ant_idle": { + "subtitle": "subtitles.antarchy.ant_idle", + "sounds": [ + { + "name": "antarchy:mob/ant/ant_idle1" + }, + { + "name": "antarchy:mob/ant/ant_idle2" + }, + { + "name": "antarchy:mob/ant/ant_idle3" + }, + { + "name": "antarchy:mob/ant/ant_idle4" + }, + { + "name": "antarchy:mob/ant/ant_idle5" + }, + { + "name": "antarchy:mob/ant/ant_idle6" + } + ] + }, + "ant_hurt": { + "subtitle": "subtitles.antarchy.ant_hurt", + "sounds": [ + { + "name": "antarchy:mob/ant/ant_hurt" + } + ] + }, + "ant_bite": { + "subtitle": "subtitles.antarchy.ant_bite", + "sounds": [ + { + "name": "antarchy:mob/ant/ant_bite" + } + ] + }, + "ant_gather": { + "subtitle": "subtitles.antarchy.ant_gather", + "sounds": [ + { + "name": "antarchy:mob/ant/ant_gather1" + }, + { + "name": "antarchy:mob/ant/ant_gather2" + } + ] + }, + "ant_nest": { + "subtitle": "subtitles.antarchy.ant_nest", + "sounds": [ + { + "name": "antarchy:block/ant_nest_exit" + } + ] + }, + "cloud_shark_bite": { + "subtitle": "subtitles.antarchy.cloud_shark_bite", + "sounds": [ + { + "name": "antarchy:mob/cloud_shark/cloud_shark_bite" + } + ] + }, + "cloud_shark_idle": { + "subtitle": "subtitles.antarchy.cloud_shark_idle", + "sounds": [ + { + "name": "antarchy:mob/cloud_shark/cloud_shark_idle1" + }, + { + "name": "antarchy:mob/cloud_shark/cloud_shark_idle2" + }, + { + "name": "antarchy:mob/cloud_shark/cloud_shark_idle3" + }, + { + "name": "antarchy:mob/cloud_shark/cloud_shark_idle4" + } + ] + }, + "cloud_shark_hurt": { + "subtitle": "subtitles.antarchy.cloud_shark_hurt", + "sounds": [ + { + "name": "antarchy:mob/cloud_shark/cloud_shark_hurt" + } + ] + }, + "cloud_shark_death": { + "subtitle": "subtitles.antarchy.cloud_shark_death", + "sounds": [ + { + "name": "antarchy:mob/cloud_shark/cloud_shark_death" + } + ] + }, + "cloud_shark_fly": { + "subtitle": "subtitles.antarchy.cloud_shark_fly", + "sounds": [ + { + "name": "antarchy:mob/cloud_shark/cloud_shark_fly1" + } + ] + }, + "caterpillar_idle": { + "subtitle": "subtitles.antarchy.caterpillar_idle", + "sounds": [ + { + "name": "antarchy:mob/caterpillar/caterpillar_idle1" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_idle2" + } + ] + }, + "caterpillar_hurt": { + "subtitle": "subtitles.antarchy.caterpillar_hurt", + "sounds": [ + { + "name": "antarchy:mob/caterpillar/caterpillar_hurt1" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_hurt2" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_hurt3" + } + ] + }, + "caterpillar_crawl": { + "subtitle": "subtitles.antarchy.caterpillar_crawl", + "sounds": [ + { + "name": "antarchy:mob/caterpillar/caterpillar_crawl1" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_crawl2" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_crawl3" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_crawl4" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_crawl5" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_crawl6" + } + ] + }, + "butterfly_hurt": { + "subtitle": "subtitles.antarchy.butterfly_hurt", + "sounds": [ + { + "name": "antarchy:mob/caterpillar/caterpillar_hurt1" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_hurt2" + }, + { + "name": "antarchy:mob/caterpillar/caterpillar_hurt3" + } + ] + }, + "brutalfly_idle": { + "subtitle": "subtitles.antarchy.brutalfly_idle", + "sounds": [ + { + "name": "antarchy:mob/brutalfly/brutalfly_idle1" + }, + { + "name": "antarchy:mob/brutalfly/brutalfly_idle2" + }, + { + "name": "antarchy:mob/brutalfly/brutalfly_idle3" + } + ] + }, + "brutalfly_death": { + "subtitle": "subtitles.antarchy.brutalfly_death", + "sounds": [ + { + "name": "antarchy:mob/brutalfly/brutalfly_death1" + } + ] + }, + "missile_squid_ambient": { + "subtitle": "subtitles.antarchy.missile_squid_ambient", + "sounds": [ + { + "name": "entity.squid.ambient", + "type": "event" + } + ] + }, + "missile_squid_hurt": { + "subtitle": "subtitles.antarchy.missile_squid_hurt", + "sounds": [ + { + "name": "entity.squid.hurt", + "type": "event" + } + ] + }, + "missile_squid_death": { + "subtitle": "subtitles.antarchy.missile_squid_death", + "sounds": [ + { + "name": "entity.squid.death", + "type": "event" + } + ] + }, + "missile_squid_attack": { + "subtitle": "subtitles.antarchy.missile_squid_attack", + "sounds": [ + { + "name": "antarchy:mob/missile_squid/missile_squid_attack1" + }, + { + "name": "antarchy:mob/missile_squid/missile_squid_attack2" + }, + { + "name": "antarchy:mob/missile_squid/missile_squid_attack3" + } + ] + }, + "kraken_flying_loop": { + "subtitle": "subtitles.antarchy.kraken_flying_loop", + "sounds": [ + { + "name": "antarchy:mob/kraken/kraken_flying_loop1", + "stream": true + }, + { + "name": "antarchy:mob/kraken/kraken_flying_loop2", + "stream": true + } + ] + }, + "kraken_flying_sideways_loop": { + "subtitle": "subtitles.antarchy.kraken_flying_sideways_loop", + "sounds": [ + { + "name": "antarchy:mob/kraken/kraken_flying_sideways_loop1", + "stream": true + }, + { + "name": "antarchy:mob/kraken/kraken_flying_sideways_loop2", + "stream": true + } + ] + }, + "kraken_attack": { + "subtitle": "subtitles.antarchy.kraken_attack", + "sounds": [ + { + "name": "antarchy:mob/kraken/kraken_attack1" + } + ] + }, + "kraken_spin": { + "subtitle": "subtitles.antarchy.kraken_spin", + "sounds": [ + { + "name": "antarchy:mob/kraken/kraken_spin" + } + ] + }, + "kraken_roar": { + "subtitle": "subtitles.antarchy.kraken_roar", + "sounds": [ + { + "name": "antarchy:mob/kraken/kraken_roar" + } + ] + }, + "kraken_summon": { + "subtitle": "subtitles.antarchy.kraken_summon", + "sounds": [ + { + "name": "antarchy:mob/kraken/kraken_spawn" + } + ] + }, + "kraken_hurt": { + "subtitle": "subtitles.antarchy.kraken_hurt", + "sounds": [ + { + "name": "antarchy:mob/kraken/kraken_hurt1" + }, + { + "name": "antarchy:mob/kraken/kraken_hurt2" + } + ] + }, + "kraken_death": { + "subtitle": "subtitles.antarchy.kraken_death", + "sounds": [ + { + "name": "antarchy:mob/kraken/kraken_death" + } + ] + }, + "basilisk_idle_loop": { + "subtitle": "subtitles.antarchy.basilisk_idle_loop", + "sounds": [ + { + "name": "antarchy:mob/basilisk/basilisk_idle_loop1", + "stream": true + }, + { + "name": "antarchy:mob/basilisk/basilisk_idle_loop2", + "stream": true + } + ] + }, + "basilisk_slither_loop": { + "subtitle": "subtitles.antarchy.basilisk_slither_loop", + "sounds": [ + { + "name": "antarchy:mob/basilisk/basilisk_slither_loop1", + "stream": true + }, + { + "name": "antarchy:mob/basilisk/basilisk_slither_loop2", + "stream": true + } + ] + }, + "basilisk_bite": { + "subtitle": "subtitles.antarchy.basilisk_bite", + "sounds": [ + { + "name": "antarchy:mob/basilisk/basilisk_bite" + } + ] + }, + "basilisk_hiss": { + "subtitle": "subtitles.antarchy.basilisk_hiss", + "sounds": [ + { + "name": "antarchy:mob/basilisk/basilisk_hiss" + } + ] + }, + "basilisk_hurt": { + "subtitle": "subtitles.antarchy.basilisk_hurt", + "sounds": [ + { + "name": "antarchy:mob/basilisk/basilisk_hurt1" + }, + { + "name": "antarchy:mob/basilisk/basilisk_hurt2" + } + ] + }, + "basilisk_death": { + "subtitle": "subtitles.antarchy.basilisk_death", + "sounds": [ + { + "name": "antarchy:mob/basilisk/basilisk_death" + } + ] + }, + "bomber_walk": { + "subtitle": "subtitles.antarchy.bomber_walk", + "sounds": [ + { + "name": "antarchy:mob/bomber/walk1" + }, + { + "name": "antarchy:mob/bomber/walk2" + }, + { + "name": "antarchy:mob/bomber/walk3" + }, + { + "name": "antarchy:mob/bomber/walk4" + } + ] + }, + "bomber_knock": { + "subtitle": "subtitles.antarchy.bomber_knock", + "sounds": [ + { + "name": "antarchy:mob/bomber/knock1" + }, + { + "name": "antarchy:mob/bomber/knock2" + }, + { + "name": "antarchy:mob/bomber/knock3" + }, + { + "name": "antarchy:mob/bomber/knock4" + }, + { + "name": "antarchy:mob/bomber/knock5" + } + ] + }, + "bomber_explode": { + "subtitle": "subtitles.antarchy.bomber_explode", + "sounds": [ + { + "name": "antarchy:mob/bomber/explode1" + }, + { + "name": "antarchy:mob/bomber/explode2" + } + ] + }, + "toreterror_idle": { + "subtitle": "subtitles.antarchy.toreterror_idle", + "sounds": [ + { + "name": "antarchy:mob/toreterror/idle1" + }, + { + "name": "antarchy:mob/toreterror/idle2" + }, + { + "name": "antarchy:mob/toreterror/idle3" + } + ] + }, + "toreterror_hurt": { + "subtitle": "subtitles.antarchy.toreterror_hurt", + "sounds": [ + { + "name": "antarchy:mob/toreterror/hurt1" + }, + { + "name": "antarchy:mob/toreterror/hurt2" + }, + { + "name": "antarchy:mob/toreterror/hurt3" + } + ] + }, + "toreterror_death": { + "subtitle": "subtitles.antarchy.toreterror_death", + "sounds": [ + { + "name": "antarchy:mob/toreterror/death" + } + ] + }, + "toreterror_bomber_fire": { + "subtitle": "subtitles.antarchy.toreterror_bomber_fire", + "sounds": [ + { + "name": "antarchy:mob/toreterror/bomber_fire1" + }, + { + "name": "antarchy:mob/toreterror/bomber_fire2" + } + ] + }, + "toreterror_spin": { + "subtitle": "subtitles.antarchy.toreterror_spin", + "sounds": [ + { + "name": "antarchy:mob/toreterror/spin" + } + ] + }, + "toreterror_ricochet": { + "subtitle": "subtitles.antarchy.toreterror_ricochet", + "sounds": [ + { + "name": "antarchy:mob/toreterror/richochet1" + }, + { + "name": "antarchy:mob/toreterror/richochet2" + }, + { + "name": "antarchy:mob/toreterror/richochet3" + } + ] + }, + "water_cannon_fire": { + "subtitle": "subtitles.antarchy.water_cannon_fire", + "sounds": [ + { + "name": "antarchy:mob/toreterror/water_cannon1" + }, + { + "name": "antarchy:mob/toreterror/water_cannon2" + }, + { + "name": "antarchy:mob/toreterror/water_cannon3" + }, + { + "name": "antarchy:mob/toreterror/water_cannon4" + } + ] + }, + "toreterror_jump_up": { + "subtitle": "subtitles.antarchy.toreterror_jump_up", + "sounds": [ + { + "name": "antarchy:mob/toreterror/jump_up1" + }, + { + "name": "antarchy:mob/toreterror/jump_up2" + } + ] + }, + "toreterror_jump_land": { + "subtitle": "subtitles.antarchy.toreterror_jump_land", + "sounds": [ + { + "name": "antarchy:mob/toreterror/jump_land1" + }, + { + "name": "antarchy:mob/toreterror/jump_land2" + } + ] + }, + "stinky_fly": { + "subtitle": "subtitles.antarchy.stinky_fly", + "sounds": [ + { + "name": "antarchy:effect/stinky/stinky_flies1" + }, + { + "name": "antarchy:effect/stinky/stinky_flies2" + }, + { + "name": "antarchy:effect/stinky/stinky_flies3" + }, + { + "name": "antarchy:effect/stinky/stinky_flies4" + }, + { + "name": "antarchy:effect/stinky/stinky_flies5" + }, + { + "name": "antarchy:effect/stinky/stinky_flies6" + }, + { + "name": "antarchy:effect/stinky/stinky_flies7" + }, + { + "name": "antarchy:effect/stinky/stinky_flies8" + } + ] + }, + "thoraxis_nightmare_wastes_ambient": { + "subtitle": "subtitles.antarchy.thoraxis_nightmare_wastes_ambient", + "sounds": [ + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/ambience_reversed", + "volume": 0.28, + "weight": 4 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/dark1_reversed", + "volume": 0.24, + "weight": 2 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/dark2_reversed", + "volume": 0.24, + "weight": 2 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/ground1_reversed", + "volume": 0.2, + "weight": 1 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/ground2_reversed", + "volume": 0.2, + "weight": 1 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/ground3_reversed", + "volume": 0.2, + "weight": 1 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/ground4_reversed", + "volume": 0.2, + "weight": 1 + } + ] + }, + "thoraxis_nightmare_wastes_additions": { + "subtitle": "subtitles.antarchy.thoraxis_nightmare_wastes_additions", + "sounds": [ + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition1_reversed", + "volume": 0.6 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition2_reversed", + "volume": 0.6 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition3_reversed", + "volume": 0.6 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition4_reversed", + "volume": 0.6 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition5_reversed", + "volume": 0.6 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition6_reversed", + "volume": 0.6 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition7_reversed", + "volume": 0.6 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/addition8_reversed", + "volume": 0.6 + } + ] + }, + "thoraxis_nightmare_wastes_mood": { + "subtitle": "subtitles.antarchy.thoraxis_nightmare_wastes_mood", + "sounds": [ + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood1_reversed", + "volume": 0.5 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood2_reversed", + "volume": 0.5 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood3_reversed", + "volume": 0.5 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood4_reversed", + "volume": 0.5 + }, + { + "name": "antarchy:ambient/thoraxis/nightmare_wastes/mood5_reversed", + "volume": 0.5 + } + ] + }, + "thoraxis_dream_dunes_ambient": { + "subtitle": "subtitles.antarchy.thoraxis_dream_dunes_ambient", + "sounds": [ + { + "name": "antarchy:ambient/thoraxis/dream_dunes/wind1_reversed", + "volume": 0.3, + "weight": 3 + }, + { + "name": "antarchy:ambient/thoraxis/dream_dunes/wind2_reversed", + "volume": 0.3, + "weight": 3 + }, + { + "name": "antarchy:ambient/thoraxis/dream_dunes/wind3_reversed", + "volume": 0.3, + "weight": 3 + }, + { + "name": "antarchy:ambient/thoraxis/dream_dunes/wind4_reversed", + "volume": 0.3, + "weight": 3 + }, + { + "name": "antarchy:ambient/thoraxis/dream_dunes/with1_reversed", + "volume": 0.24, + "weight": 2 + } + ] + }, + "thoraxis_dream_dunes_additions": { + "subtitle": "subtitles.antarchy.thoraxis_dream_dunes_additions", + "sounds": [ + { + "name": "ambient/nether/soulsand_valley/sand1", + "volume": 0.65, + "weight": 3 + }, + { + "name": "ambient/nether/soulsand_valley/sand2", + "volume": 0.65, + "weight": 3 + }, + { + "name": "ambient/nether/soulsand_valley/sand3", + "volume": 0.65, + "weight": 3 + }, + { + "name": "ambient/nether/soulsand_valley/ambience", + "volume": 0.5, + "weight": 2 + }, + { + "name": "ambient/nether/soulsand_valley/mood1", + "volume": 0.45, + "weight": 1 + }, + { + "name": "ambient/nether/soulsand_valley/mood2", + "volume": 0.45, + "weight": 1 + } + ] + }, + "thoraxis_dream_dunes_mood": { + "subtitle": "subtitles.antarchy.thoraxis_dream_dunes_mood", + "sounds": [ + { + "name": "ambient/nether/soulsand_valley/mood1", + "volume": 0.45, + "weight": 2 + }, + { + "name": "ambient/nether/soulsand_valley/mood2", + "volume": 0.45, + "weight": 2 + } + ] + }, + "thoraxis_lucid_pools_ambient": { + "subtitle": "subtitles.antarchy.thoraxis_lucid_pools_ambient", + "sounds": [ + { + "name": "antarchy:ambient/thoraxis/lucid_pools/ambient", + "volume": 0.26, + "weight": 4 + } + ] + }, + "thoraxis_lucid_pools_additions": { + "subtitle": "subtitles.antarchy.thoraxis_lucid_pools_additions", + "sounds": [ + { + "name": "antarchy:ambient/thoraxis/lucid_pools/curse1", + "volume": 0.48 + }, + { + "name": "antarchy:ambient/thoraxis/lucid_pools/curse2", + "volume": 0.48 + }, + { + "name": "antarchy:ambient/thoraxis/lucid_pools/curse3", + "volume": 0.48 + }, + { + "name": "antarchy:ambient/thoraxis/lucid_pools/curse4", + "volume": 0.48 + } + ] + }, + "thoraxis_lucid_pools_mood": { + "subtitle": "subtitles.antarchy.thoraxis_lucid_pools_mood", + "sounds": [ + { + "name": "ambient/nether/soulsand_valley/mood1", + "volume": 0.45, + "weight": 2 + }, + { + "name": "ambient/nether/soulsand_valley/mood2", + "volume": 0.45, + "weight": 2 + } + ] + }, + "lucid_ambient": { + "subtitle": "subtitles.antarchy.lucid_ambient", + "sounds": [ + { + "name": "antarchy:mob/lucid/lucid_ambience", + "stream": true + } + ] + }, + "lucid_flying": { + "subtitle": "subtitles.antarchy.lucid_flying", + "sounds": [ + { + "name": "antarchy:mob/lucid/lucid_flying", + "stream": true + } + ] + }, + "lucid_attack": { + "subtitle": "subtitles.antarchy.lucid_attack", + "sounds": [ + { + "name": "antarchy:mob/lucid/lucid_attack" + } + ] + }, + "lucid_bolt": { + "subtitle": "subtitles.antarchy.lucid_bolt", + "sounds": [ + { + "name": "antarchy:mob/lucid/lucid_bolt" + } + ] + }, + "lucid_hurt": { + "subtitle": "subtitles.antarchy.lucid_hurt", + "sounds": [ + { + "name": "antarchy:mob/lucid/lucid_hurt1" + }, + { + "name": "antarchy:mob/lucid/lucid_hurt2" + } + ] + }, + "lucid_death": { + "subtitle": "subtitles.antarchy.lucid_death", + "sounds": [ + { + "name": "antarchy:mob/lucid/lucid_death" + } + ] + }, + "reverie_idle": { + "subtitle": "subtitles.antarchy.reverie_idle", + "sounds": [ + { + "name": "antarchy:mob/reverie/reverie_idle1", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_idle2", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_idle3", + "volume": 0.5 + } + ] + }, + "reverie_hurt": { + "subtitle": "subtitles.antarchy.reverie_hurt", + "sounds": [ + { + "name": "antarchy:mob/reverie/reverie_hurt1", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_hurt2", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_hurt3", + "volume": 0.5 + } + ] + }, + "reverie_worry": { + "subtitle": "subtitles.antarchy.reverie_worry", + "sounds": [ + { + "name": "antarchy:mob/reverie/reverie_worry1", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_worry2", + "volume": 0.5 + } + ] + }, + "reverie_save": { + "subtitle": "subtitles.antarchy.reverie_save", + "sounds": [ + { + "name": "antarchy:mob/reverie/reverie_save1", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_save2", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_save3", + "volume": 0.5 + } + ] + }, + "reverie_join_player": { + "subtitle": "subtitles.antarchy.reverie_join_player", + "sounds": [ + { + "name": "antarchy:mob/reverie/reverie_joinplayer1", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_joinplayer2", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_joinplayer3", + "volume": 0.5 + } + ] + }, + "reverie_alert": { + "subtitle": "subtitles.antarchy.reverie_alert", + "sounds": [ + { + "name": "antarchy:mob/reverie/reverie_alert1", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_alert2", + "volume": 0.5 + }, + { + "name": "antarchy:mob/reverie/reverie_alert3", + "volume": 0.5 + } + ] + }, + "flying_squirrel_idle": { + "subtitle": "subtitles.antarchy.flying_squirrel_idle", + "sounds": [ + { + "name": "antarchy:mob/flying_squirrel/flying_squirrel_idle1" + }, + { + "name": "minecraft:mob/fox/sniff1" + }, + { + "name": "minecraft:mob/fox/sniff2" + }, + { + "name": "minecraft:mob/fox/sniff4" + } + ] + }, + "flying_squirrel_beg": { + "subtitle": "subtitles.antarchy.flying_squirrel_beg", + "sounds": [ + { + "name": "entity.cat.beg_for_food", + "type": "event" + } + ] + }, + "flying_squirrel_nut": { + "subtitle": "subtitles.antarchy.flying_squirrel_nut", + "sounds": [ + { + "name": "minecraft:mob/fox/eat1" + }, + { + "name": "minecraft:mob/fox/eat2" + }, + { + "name": "minecraft:mob/fox/eat3" + } + ] + }, + "flying_squirrel_glide_loop": { + "subtitle": "subtitles.antarchy.flying_squirrel_glide_loop", + "sounds": [ + { + "name": "antarchy:mob/flying_squirrel/flying_squirrel_glide_loop" + } + ] + }, + "flying_squirrel_hurt": { + "subtitle": "subtitles.antarchy.flying_squirrel_hurt", + "sounds": [ + { + "name": "minecraft:mob/fox/hurt1" + }, + { + "name": "minecraft:mob/fox/hurt2" + }, + { + "name": "minecraft:mob/fox/hurt3" + }, + { + "name": "minecraft:mob/fox/hurt4" + } + ] + }, + "flying_squirrel_death": { + "subtitle": "subtitles.antarchy.flying_squirrel_death", + "sounds": [ + { + "name": "minecraft:mob/fox/death1" + }, + { + "name": "minecraft:mob/fox/death2" + } + ] + }, + "nightmare_idle": { + "subtitle": "subtitles.antarchy.nightmare_idle", + "sounds": [ + { + "name": "antarchy:mob/nightmare/nightmare_idle1" + }, + { + "name": "antarchy:mob/nightmare/nightmare_idle2" + }, + { + "name": "antarchy:mob/nightmare/nightmare_idle3" + }, + { + "name": "antarchy:mob/nightmare/nightmare_idle4" + } + ] + }, + "nightmare_hurt": { + "subtitle": "subtitles.antarchy.nightmare_hurt", + "sounds": [ + { + "name": "antarchy:mob/nightmare/nightmare_hurt1" + } + ] + }, + "nightmare_roar": { + "subtitle": "subtitles.antarchy.nightmare_roar", + "sounds": [ + { + "name": "antarchy:mob/nightmare/nightmare_roar1" + }, + { + "name": "antarchy:mob/nightmare/nightmare_roar2" + } + ] + }, + "nightmare_death": { + "subtitle": "subtitles.antarchy.nightmare_death", + "sounds": [ + { + "name": "antarchy:mob/nightmare/nightmare_death" + } + ] + }, + "nightmare_bite": { + "subtitle": "subtitles.antarchy.nightmare_bite", + "sounds": [ + { + "name": "minecraft:mob/phantom/bite1" + }, + { + "name": "minecraft:mob/phantom/bite2" + } + ] + }, + "nightmare_flap": { + "subtitle": "subtitles.antarchy.nightmare_flap", + "sounds": [ + { + "name": "minecraft:mob/enderdragon/wings1" + }, + { + "name": "minecraft:mob/enderdragon/wings2" + }, + { + "name": "minecraft:mob/enderdragon/wings3" + }, + { + "name": "minecraft:mob/enderdragon/wings4" + }, + { + "name": "minecraft:mob/enderdragon/wings5" + }, + { + "name": "minecraft:mob/enderdragon/wings6" + } + ] + }, + "mantis_ambient": { + "subtitle": "subtitles.antarchy.mantis_ambient", + "sounds": [ + { + "name": "antarchy:mob/mantis/mantis_idle1" + }, + { + "name": "antarchy:mob/mantis/mantis_idle2" + }, + { + "name": "antarchy:mob/mantis/mantis_idle3" + }, + { + "name": "antarchy:mob/mantis/mantis_idle4" + }, + { + "name": "antarchy:mob/mantis/mantis_idle5" + }, + { + "name": "antarchy:mob/mantis/mantis_idle6" + }, + { + "name": "antarchy:mob/mantis/mantis_idle7" + } + ] + }, + "mantis_hurt": { + "subtitle": "subtitles.antarchy.mantis_hurt", + "sounds": [ + { + "name": "antarchy:mob/mantis/mantis_hurt1" + }, + { + "name": "antarchy:mob/mantis/mantis_hurt2" + }, + { + "name": "antarchy:mob/mantis/mantis_hurt3" + } + ] + }, + "mantis_attack": { + "subtitle": "subtitles.antarchy.mantis_attack", + "sounds": [ + { + "name": "antarchy:mob/mantis/mantis_attack1" + }, + { + "name": "antarchy:mob/mantis/mantis_attack2" + }, + { + "name": "antarchy:mob/mantis/mantis_attack3" + }, + { + "name": "antarchy:mob/mantis/mantis_attack4" + } + ] + }, + "mantis_fly_loop": { + "subtitle": "subtitles.antarchy.mantis_fly_loop", + "sounds": [ + { + "name": "antarchy:mob/mantis/mantis_fly_loop", + "stream": true + } + ] + }, + "gravity_gun_pickup": { + "subtitle": "subtitles.antarchy.gravity_gun_pickup", + "sounds": [ + { + "name": "antarchy:gravity_gun/gravity_gun_pickup" + } + ] + }, + "gravity_gun_drop": { + "subtitle": "subtitles.antarchy.gravity_gun_drop", + "sounds": [ + { + "name": "antarchy:gravity_gun/gravity_gun_drop" + } + ] + }, + "gravity_gun_hold_loop": { + "subtitle": "subtitles.antarchy.gravity_gun_hold_loop", + "sounds": [ + { + "name": "antarchy:gravity_gun/gravity_gun_hold_loop" + } + ] + }, + "gravity_gun_launch": { + "subtitle": "subtitles.antarchy.gravity_gun_launch", + "sounds": [ + { + "name": "antarchy:gravity_gun/gravity_gun_launch1" + }, + { + "name": "antarchy:gravity_gun/gravity_gun_launch2" + }, + { + "name": "antarchy:gravity_gun/gravity_gun_launch3" + }, + { + "name": "antarchy:gravity_gun/gravity_gun_launch4" + } + ] + }, + "gravity_gun_dryfire": { + "subtitle": "subtitles.antarchy.gravity_gun_dryfire", + "sounds": [ + { + "name": "antarchy:gravity_gun/gravity_gun_dryfire" + } + ] + }, + "bed_bug_ambient": { + "subtitle": "subtitles.antarchy.bed_bug_ambient", + "sounds": [ + { + "name": "antarchy:mob/bed_bug/bed_bug_ambient1" + }, + { + "name": "antarchy:mob/bed_bug/bed_bug_ambient2" + } + ] + }, + "bed_bug_hurt": { + "subtitle": "subtitles.antarchy.bed_bug_hurt", + "sounds": [ + { + "name": "antarchy:mob/bed_bug/bed_bug_hurt1" + }, + { + "name": "antarchy:mob/bed_bug/bed_bug_hurt2" + } + ] + }, + "bed_bug_attack": { + "subtitle": "subtitles.antarchy.bed_bug_attack", + "sounds": [ + { + "name": "antarchy:mob/bed_bug/bed_bug_attack1" + } + ] + }, + "wasp_idle": { + "subtitle": "subtitles.antarchy.wasp_idle", + "sounds": [ + { + "name": "antarchy:mob/wasp/buzz1" + }, + { + "name": "antarchy:mob/wasp/buzz2" + } + ] + }, + "wasp_hurt": { + "subtitle": "subtitles.antarchy.wasp_hurt", + "sounds": [ + { + "name": "antarchy:mob/wasp/hurt1" + }, + { + "name": "antarchy:mob/wasp/hurt2" + }, + { + "name": "antarchy:mob/wasp/hurt3" + } + ] + }, + "wasp_attack": { + "subtitle": "subtitles.antarchy.wasp_attack", + "sounds": [ + { + "name": "antarchy:mob/wasp/attack1" + }, + { + "name": "antarchy:mob/wasp/attack2" + }, + { + "name": "antarchy:mob/wasp/attack3" + }, + { + "name": "antarchy:mob/wasp/attack4" + }, + { + "name": "antarchy:mob/wasp/attack5" + } + ] + }, + "wasp_death": { + "subtitle": "subtitles.antarchy.wasp_death", + "sounds": [ + { + "name": "antarchy:mob/wasp/death1" + }, + { + "name": "antarchy:mob/wasp/death2" + } + ] + }, + "scorpion_ambient": { + "subtitle": "subtitles.antarchy.scorpion_ambient", + "sounds": [ + { + "name": "antarchy:mob/scorpion/scorpion_ambient1" + } + ] + }, + "scorpion_hurt": { + "subtitle": "subtitles.antarchy.scorpion_hurt", + "sounds": [ + { + "name": "antarchy:mob/scorpion/scorpion_hurt1" + }, + { + "name": "antarchy:mob/scorpion/scorpion_hurt2" + }, + { + "name": "antarchy:mob/scorpion/scorpion_hurt3" + } + ] + }, + "scorpion_attack": { + "subtitle": "subtitles.antarchy.scorpion_attack", + "sounds": [ + { + "name": "antarchy:mob/scorpion/scorpion_attack1" + }, + { + "name": "antarchy:mob/scorpion/scorpion_attack2" + } + ] + }, + "emperor_scorpion_ambient": { + "subtitle": "subtitles.antarchy.emperor_scorpion_ambient", + "sounds": [ + { + "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_ambient1" + } + ] + }, + "emperor_scorpion_hurt": { + "subtitle": "subtitles.antarchy.emperor_scorpion_hurt", + "sounds": [ + { + "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_hurt1" + }, + { + "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_hurt2" + }, + { + "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_hurt3" + } + ] + }, + "emperor_scorpion_attack": { + "subtitle": "subtitles.antarchy.emperor_scorpion_attack", + "sounds": [ + { + "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_attack1" + } + ] + }, + "emperor_scorpion_roar": { + "subtitle": "subtitles.antarchy.emperor_scorpion_roar", + "sounds": [ + { + "name": "antarchy:mob/emperor_scorpion/emperor_scorpion_roar1" + } + ] + }, + "moleworm_ambient": { + "subtitle": "subtitles.antarchy.moleworm_ambient", + "sounds": [ + { + "name": "antarchy:mob/moleworm/moleworm_idle1" + }, + { + "name": "antarchy:mob/moleworm/moleworm_idle2" + }, + { + "name": "antarchy:mob/moleworm/moleworm_idle3" + }, + { + "name": "antarchy:mob/moleworm/moleworm_idle4" + }, + { + "name": "antarchy:mob/moleworm/moleworm_idle5" + }, + { + "name": "antarchy:mob/moleworm/moleworm_idle6" + }, + { + "name": "antarchy:mob/moleworm/moleworm_idle7" + } + ] + }, + "moleworm_hurt": { + "subtitle": "subtitles.antarchy.moleworm_hurt", + "sounds": [ + { + "name": "antarchy:mob/moleworm/moleworm_hurt1" + }, + { + "name": "antarchy:mob/moleworm/moleworm_hurt2" + }, + { + "name": "antarchy:mob/moleworm/moleworm_hurt3" + } + ] + }, + "moleworm_attack": { + "subtitle": "subtitles.antarchy.moleworm_attack", + "sounds": [ + { + "name": "antarchy:mob/moleworm/moleworm_attack1" + }, + { + "name": "antarchy:mob/moleworm/moleworm_attack2" + } + ] + }, + "moleworm_dig": { + "subtitle": "subtitles.antarchy.moleworm_dig", + "sounds": [ + { + "name": "antarchy:mob/moleworm/moleworm_dig1" + }, + { + "name": "antarchy:mob/moleworm/moleworm_dig2" + }, + { + "name": "antarchy:mob/moleworm/moleworm_dig3" + } + ] + }, + "molevore_ambient": { + "subtitle": "subtitles.antarchy.molevore_ambient", + "sounds": [ + { + "name": "antarchy:mob/molevore/molevore_idle1" + }, + { + "name": "antarchy:mob/molevore/molevore_idle2" + }, + { + "name": "antarchy:mob/molevore/molevore_idle3" + } + ] + }, + "molevore_hurt": { + "subtitle": "subtitles.antarchy.molevore_hurt", + "sounds": [ + { + "name": "antarchy:mob/molevore/molevore_hurt1" + }, + { + "name": "antarchy:mob/molevore/molevore_hurt2" + }, + { + "name": "antarchy:mob/molevore/molevore_hurt3" + } + ] + }, + "molevore_attack": { + "subtitle": "subtitles.antarchy.molevore_attack", + "sounds": [ + { + "name": "antarchy:mob/molevore/molevore_attack1" + }, + { + "name": "antarchy:mob/molevore/molevore_attack2" + }, + { + "name": "antarchy:mob/molevore/molevore_attack3" + } + ] + }, + "molevore_dig": { + "subtitle": "subtitles.antarchy.molevore_dig", + "sounds": [ + { + "name": "antarchy:mob/molevore/molevore_dig1" + } + ] + }, + "duct_tape_use": { + "subtitle": "subtitles.antarchy.duct_tape_use", + "sounds": [ + { + "name": "antarchy:block/duct_tape/duct_tape1" + }, + { + "name": "antarchy:block/duct_tape/duct_tape2" + }, + { + "name": "antarchy:block/duct_tape/duct_tape3" + }, + { + "name": "antarchy:block/duct_tape/duct_tape4" + }, + { + "name": "antarchy:block/duct_tape/duct_tape5" + }, + { + "name": "antarchy:block/duct_tape/duct_tape6" + }, + { + "name": "antarchy:block/duct_tape/duct_tape7" + }, + { + "name": "antarchy:block/duct_tape/duct_tape8" + } + ] + }, + "potent_nyxite_hypnotic_gas": { + "subtitle": "subtitles.antarchy.potent_nyxite_hypnotic_gas", + "sounds": [ + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient1" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient2" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient3" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient4" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient5" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient6" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient7" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient8" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient9" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient10" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient11" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient12" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient13" + }, + { + "name": "antarchy:block/potent_nyxite/hypnotic_gas/ambient14" + } + ] + }, + "potent_nyxite_geyser_eruption_start": { + "subtitle": "subtitles.antarchy.potent_nyxite_geyser_eruption", + "sounds": [ + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption1" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption2" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption3" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption4" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption5" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption6" + } + ] + }, + "potent_nyxite_geyser_eruption_active": { + "subtitle": "subtitles.antarchy.potent_nyxite_geyser_eruption", + "sounds": [ + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active1" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active2" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active3" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active4" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active5" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active6" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active7" + } + ] + }, + "potent_nyxite_geyser_continuous_start": { + "subtitle": "subtitles.antarchy.potent_nyxite_geyser_continuous", + "sounds": [ + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption1" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption2" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption3" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption4" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption5" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption6" + } + ] + }, + "potent_nyxite_geyser_continuous_active": { + "subtitle": "subtitles.antarchy.potent_nyxite_geyser_continuous", + "sounds": [ + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active1" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active2" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active3" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active4" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active5" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active6" + }, + { + "name": "antarchy:block/potent_nyxite/geyser_continuous/eruption_active7" + } + ] + }, + "ambient.elythia.firefly": { + "sounds": [ + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush1", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush2", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush3", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush4", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush5", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush6", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush7", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush8", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush9", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush10", + "stream": false + }, + { + "name": "antarchy:ambient/elythia/firefly/firefly_bush11", + "stream": false + } + ] + }, + "triffid_attack": { + "subtitle": "subtitles.antarchy.triffid_attack", + "sounds": [ + { + "name": "antarchy:mob/triffid/triffid_attack1" + } + ] + }, + "triffid_grab": { + "subtitle": "subtitles.antarchy.triffid_grab", + "sounds": [ + { + "name": "antarchy:mob/triffid/triffid_grab1" + } + ] + }, + "triffid_hurt": { + "subtitle": "subtitles.antarchy.triffid_hurt", + "sounds": [ + { + "name": "antarchy:mob/triffid/triffid_hurt1" + }, + { + "name": "antarchy:mob/triffid/triffid_hurt2" + }, + { + "name": "antarchy:mob/triffid/triffid_hurt3" + } + ] + }, + "triffid_death": { + "subtitle": "subtitles.antarchy.triffid_death", + "sounds": [ + { + "name": "antarchy:mob/triffid/triffid_hurt3" + } + ] + }, + "triffid_hiss": { + "subtitle": "subtitles.antarchy.triffid_hiss", + "sounds": [ + { + "name": "antarchy:mob/triffid/triffid_hiss1" + } + ] + }, + "triffid_growl": { + "subtitle": "subtitles.antarchy.triffid_growl", + "sounds": [ + { + "name": "antarchy:mob/triffid/triffid_growl1" + }, + { + "name": "antarchy:mob/triffid/triffid_growl2" + } + ] + } } diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite1.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite1.ogg deleted file mode 100644 index fd89b048..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite1.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite2.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite2.ogg deleted file mode 100644 index 1993fb69..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite2.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite3.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite3.ogg deleted file mode 100644 index 1f44cc93..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite3.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite4.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite4.ogg deleted file mode 100644 index 3fa77eaa..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite4.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl1.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl1.ogg deleted file mode 100644 index 746f4f3a..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl1.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl2.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl2.ogg deleted file mode 100644 index a60677ea..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl2.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt1.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt1.ogg deleted file mode 100644 index 1ad6f0ec..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt1.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt2.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt2.ogg deleted file mode 100644 index e1f10239..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt2.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_bite1.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_bite1.ogg deleted file mode 100644 index a72b530e..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_bite1.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_fly_loop.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_fly_loop.ogg deleted file mode 100644 index 7204c176..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_fly_loop.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt1.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt1.ogg deleted file mode 100644 index 1ad6f0ec..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt1.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt2.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt2.ogg deleted file mode 100644 index e1f10239..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt2.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl1.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl1.ogg deleted file mode 100644 index 669bbdc8..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl1.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl2.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl2.ogg deleted file mode 100644 index 1305bb04..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl2.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_lichen.png b/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_lichen.png deleted file mode 100644 index cb7a9d84..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_lichen.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_moss_block.png b/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_moss_block.png deleted file mode 100644 index 4ec05b6b..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_moss_block.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_moss_carpet.png b/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_moss_carpet.png deleted file mode 100644 index 4ec05b6b..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/amber_moss/amber_moss_carpet.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/broodstone/broodstone.png b/common/src/main/resources/assets/antarchy/textures/block/broodstone/broodstone.png deleted file mode 100644 index 19504eca..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/broodstone/broodstone.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/cavaryn_portal.png b/common/src/main/resources/assets/antarchy/textures/block/cavaryn_portal.png deleted file mode 100644 index 55cd182a..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/cavaryn_portal.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_base.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_base.png deleted file mode 100644 index 49c5d6a1..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_base.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_frustum.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_frustum.png deleted file mode 100644 index 1660e8e0..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_frustum.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_middle.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_middle.png deleted file mode 100644 index cecd80c1..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_middle.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_tip.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_tip.png deleted file mode 100644 index 324c5c8a..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_tip.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_tip_merge.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_tip_merge.png deleted file mode 100644 index 9c78714d..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_down_tip_merge.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_base.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_base.png deleted file mode 100644 index f9eab88e..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_base.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_frustum.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_frustum.png deleted file mode 100644 index a4894a9d..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_frustum.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_middle.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_middle.png deleted file mode 100644 index 37c8e4d2..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_middle.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_tip.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_tip.png deleted file mode 100644 index 9b66fa38..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_tip.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_tip_merge.png b/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_tip_merge.png deleted file mode 100644 index 0d9972f2..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/chiten_spike/chiten_spike_up_tip_merge.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg.png b/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg.png deleted file mode 100644 index 905c49c9..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_slightly_cracked.png b/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_slightly_cracked.png deleted file mode 100644 index 0a4765be..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_slightly_cracked.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_very_cracked.png b/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_very_cracked.png deleted file mode 100644 index 9040f255..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_very_cracked.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/creepvine.png b/common/src/main/resources/assets/antarchy/textures/block/creepvine.png deleted file mode 100644 index b578b4fa..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/creepvine.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg.png b/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg.png deleted file mode 100644 index 10089a41..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_slightly_cracked.png b/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_slightly_cracked.png deleted file mode 100644 index ac965ebb..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_slightly_cracked.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_very_cracked.png b/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_very_cracked.png deleted file mode 100644 index 10cf9dd9..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_very_cracked.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/block/myrmite.png b/common/src/main/resources/assets/antarchy/textures/block/myrmite.png deleted file mode 100644 index 1a74738a..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/block/myrmite.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/cloud_shark.png b/common/src/main/resources/assets/antarchy/textures/entity/cloud_shark.png deleted file mode 100644 index 50cbf88f..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/entity/cloud_shark.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/cloud_shark/cloud_shark.png b/common/src/main/resources/assets/antarchy/textures/entity/cloud_shark/cloud_shark.png index 0c983aab..94d7f245 100644 Binary files a/common/src/main/resources/assets/antarchy/textures/entity/cloud_shark/cloud_shark.png and b/common/src/main/resources/assets/antarchy/textures/entity/cloud_shark/cloud_shark.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/dorrie.png b/common/src/main/resources/assets/antarchy/textures/entity/dorrie.png index 98b9b53c..34eded06 100644 Binary files a/common/src/main/resources/assets/antarchy/textures/entity/dorrie.png and b/common/src/main/resources/assets/antarchy/textures/entity/dorrie.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/dorrie_saddle.png b/common/src/main/resources/assets/antarchy/textures/entity/dorrie_saddle.png index 8df880c9..810382c4 100644 Binary files a/common/src/main/resources/assets/antarchy/textures/entity/dorrie_saddle.png and b/common/src/main/resources/assets/antarchy/textures/entity/dorrie_saddle.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/emperor_scorpion/emperor_scorpion_harden.png b/common/src/main/resources/assets/antarchy/textures/entity/emperor_scorpion/emperor_scorpion_harden.png new file mode 100644 index 00000000..51d8cd61 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/entity/emperor_scorpion/emperor_scorpion_harden.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer.png b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer.png new file mode 100644 index 00000000..22851d37 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby.png b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby.png new file mode 100644 index 00000000..4198a656 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby_day.png b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby_day.png new file mode 100644 index 00000000..0ce1e803 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby_day.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby_emissive.png b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby_emissive.png new file mode 100644 index 00000000..4c406021 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_baby_emissive.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_day.png b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_day.png new file mode 100644 index 00000000..e46e0af4 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_day.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_emissive.png b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_emissive.png new file mode 100644 index 00000000..22851d37 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/entity/glimmer/glimmer_emissive.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/nightmare.png b/common/src/main/resources/assets/antarchy/textures/entity/nightmare.png index e8030976..47846a9c 100644 Binary files a/common/src/main/resources/assets/antarchy/textures/entity/nightmare.png and b/common/src/main/resources/assets/antarchy/textures/entity/nightmare.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/nightmare_emissive.png b/common/src/main/resources/assets/antarchy/textures/entity/nightmare_emissive.png new file mode 100644 index 00000000..018fd40c Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/entity/nightmare_emissive.png differ diff --git a/common/src/main/resources/assets/antarchy/textures/entity/spit_bug.png b/common/src/main/resources/assets/antarchy/textures/entity/spit_bug.png deleted file mode 100644 index 895cd975..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/entity/spit_bug.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/item/chiten.png b/common/src/main/resources/assets/antarchy/textures/item/chiten.png deleted file mode 100644 index ff0ea5bf..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/item/chiten.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/item/chiten_spike.png b/common/src/main/resources/assets/antarchy/textures/item/chiten_spike.png deleted file mode 100644 index 9b66fa38..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/item/chiten_spike.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/item/creeping_horror_egg.png b/common/src/main/resources/assets/antarchy/textures/item/creeping_horror_egg.png deleted file mode 100644 index 3f83ab76..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/item/creeping_horror_egg.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/item/lurking_terror_egg.png b/common/src/main/resources/assets/antarchy/textures/item/lurking_terror_egg.png deleted file mode 100644 index 6a372140..00000000 Binary files a/common/src/main/resources/assets/antarchy/textures/item/lurking_terror_egg.png and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/textures/mob_effect/glimmers_grace.png b/common/src/main/resources/assets/antarchy/textures/mob_effect/glimmers_grace.png new file mode 100644 index 00000000..b0214de7 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/textures/mob_effect/glimmers_grace.png differ diff --git a/common/src/main/resources/data/antarchy/dimension/cavaryn.json b/common/src/main/resources/data/antarchy/dimension/cavaryn.json deleted file mode 100644 index 85246260..00000000 --- a/common/src/main/resources/data/antarchy/dimension/cavaryn.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "antarchy:cavaryn", - "generator": { - "type": "minecraft:noise", - "settings": "antarchy:cavaryn", - "biome_source": { - "type": "minecraft:multi_noise", - "biomes": [ - { - "parameters": { - "temperature": [-1.0, 1.0], - "humidity": [-1.0, 0.5], - "continentalness": [-1.0, 1.0], - "erosion": [-1.0, 1.0], - "weirdness": [-1.0, 1.0], - "depth": [-2.0, -0.1], - "offset": 0.0 - }, - "biome": "antarchy:cavaryn" - }, - { - "parameters": { - "temperature": [-1.0, 1.0], - "humidity": [0.5, 1.0], - "continentalness": [-1.0, 1.0], - "erosion": [-1.0, 1.0], - "weirdness": [-1.0, 1.0], - "depth": [-2.0, -0.1], - "offset": 0.0 - }, - "biome": "antarchy:rolly_caves" - }, - { - "parameters": { - "temperature": [-1.0, 1.0], - "humidity": [-1.0, 1.0], - "continentalness": [-1.0, 1.0], - "erosion": [-1.0, 1.0], - "weirdness": [-1.0, 1.0], - "depth": [-0.1, 2.0], - "offset": 0.0 - }, - "biome": "antarchy:brooding_tunnels" - } - ] - } - } -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_lichen.json b/common/src/main/resources/data/antarchy/loot_table/blocks/amber_lichen.json deleted file mode 100644 index dfba2794..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_lichen.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:amber_lichen" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/amber_lichen" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_block.json b/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_block.json deleted file mode 100644 index a8bfc055..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:amber_moss_block" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/amber_moss_block" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_carpet.json b/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_carpet.json deleted file mode 100644 index 7e68cad1..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_carpet.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:amber_moss_carpet" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/amber_moss_carpet" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/big_bush.json b/common/src/main/resources/data/antarchy/loot_table/blocks/big_bush.json deleted file mode 100644 index bdc0967f..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/big_bush.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": "minecraft:shears" - } - } - ], - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "antarchy:big_bush", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:big_bush", - "properties": { - "age": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3.0 - } - ] - }, - { - "type": "minecraft:item", - "name": "antarchy:big_bush", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:big_bush", - "properties": { - "age": "1" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0 - } - ] - }, - { - "type": "minecraft:item", - "name": "antarchy:big_bush" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/big_bush" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/bile_vein.json b/common/src/main/resources/data/antarchy/loot_table/blocks/bile_vein.json deleted file mode 100644 index 32eb33c8..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/bile_vein.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:bile_vein" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/bile_vein" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/broodstone.json b/common/src/main/resources/data/antarchy/loot_table/blocks/broodstone.json deleted file mode 100644 index 127d6661..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/broodstone.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:broodstone" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/broodstone" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_block.json b/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_block.json deleted file mode 100644 index c53e8175..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten_block" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/chiten_block" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_spike.json b/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_spike.json deleted file mode 100644 index b1d9fae3..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_spike.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten_spike" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json b/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json deleted file mode 100644 index 836c069c..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/turtle_egg" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/creepvine.json b/common/src/main/resources/data/antarchy/loot_table/blocks/creepvine.json deleted file mode 100644 index e1abf289..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/creepvine.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:creepvine" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/creepvine" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json b/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json deleted file mode 100644 index 8f78d48b..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/turtle_egg" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/myrmite.json b/common/src/main/resources/data/antarchy/loot_table/blocks/myrmite.json deleted file mode 100644 index fd82e19e..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/myrmite.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:myrmite" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/myrmite" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/torchflower_bush.json b/common/src/main/resources/data/antarchy/loot_table/blocks/torchflower_bush.json deleted file mode 100644 index 51df220e..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/torchflower_bush.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "antarchy:torchflower_bush", - "condition": "minecraft:block_state_property", - "properties": { - "half": "lower" - } - } - ], - "name": "antarchy:torchflower_bush" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/torchflower_bush" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/very_short_grass.json b/common/src/main/resources/data/antarchy/loot_table/blocks/very_short_grass.json deleted file mode 100644 index 71a04620..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/very_short_grass.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": "minecraft:shears" - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:very_short_grass" - } - ], - "rolls": 1.0 - }, - { - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:wheat_seeds", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.125, - 0.14285715, - 0.16666667, - 0.2 - ] - } - ], - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/very_short_grass" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/very_tall_grass.json b/common/src/main/resources/data/antarchy/loot_table/blocks/very_tall_grass.json deleted file mode 100644 index e710fdd2..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/very_tall_grass.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": "minecraft:shears" - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "antarchy:very_tall_grass", - "condition": "minecraft:block_state_property", - "properties": { - "part": "lower" - } - } - ], - "name": "antarchy:very_tall_grass" - } - ], - "rolls": 1.0 - }, - { - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "antarchy:very_tall_grass", - "condition": "minecraft:block_state_property", - "properties": { - "part": "lower" - } - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.125, - 0.14285715, - 0.16666667, - 0.2 - ] - } - ], - "name": "minecraft:wheat_seeds", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/very_tall_grass" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json b/common/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json deleted file mode 100644 index 6f31cc60..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:killed_by_player" - } - ] - } - ], - "random_sequence": "antarchy:entities/creeping_horror" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json b/common/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json deleted file mode 100644 index d206ce93..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:jumpy_bug_leg", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:killed_by_player" - } - ] - } - ] -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json b/common/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json deleted file mode 100644 index 48b83cfa..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:killed_by_player" - } - ] - } - ], - "random_sequence": "antarchy:entities/lurking_terror" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/spit_bug.json b/common/src/main/resources/data/antarchy/loot_table/entities/spit_bug.json deleted file mode 100644 index bed1a754..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/spit_bug.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:killed_by_player" - } - ] - } - ], - "random_sequence": "antarchy:entities/spit_bug" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/stink_bug.json b/common/src/main/resources/data/antarchy/loot_table/entities/stink_bug.json deleted file mode 100644 index a392269a..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/stink_bug.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:stink_bug" - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 1.0 - } - } - ] - } - ], - "random_sequence": "antarchy:entities/stink_bug" -} diff --git a/common/src/main/resources/data/antarchy/recipe/amber_moss_carpet.json b/common/src/main/resources/data/antarchy/recipe/amber_moss_carpet.json deleted file mode 100644 index 3f0c3b5d..00000000 --- a/common/src/main/resources/data/antarchy/recipe/amber_moss_carpet.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "antarchy:amber_moss_block" - } - }, - "pattern": [ - "#", - "#" - ], - "result": { - "count": 3, - "id": "antarchy:amber_moss_carpet" - } -} diff --git a/common/src/main/resources/data/antarchy/recipe/bone_meal_from_chiten.json b/common/src/main/resources/data/antarchy/recipe/bone_meal_from_chiten.json deleted file mode 100644 index 9f10eac7..00000000 --- a/common/src/main/resources/data/antarchy/recipe/bone_meal_from_chiten.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "antarchy:chiten" - } - ], - "result": { - "count": 1, - "id": "minecraft:bone_meal" - } -} diff --git a/common/src/main/resources/data/antarchy/recipe/chiten_block.json b/common/src/main/resources/data/antarchy/recipe/chiten_block.json deleted file mode 100644 index b035961a..00000000 --- a/common/src/main/resources/data/antarchy/recipe/chiten_block.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "antarchy:chiten" - } - }, - "pattern": [ - "###", - "###", - "###" - ], - "result": { - "count": 1, - "id": "antarchy:chiten_block" - } -} diff --git a/common/src/main/resources/data/antarchy/recipe/orange_dye_from_torchflower_bush.json b/common/src/main/resources/data/antarchy/recipe/orange_dye_from_torchflower_bush.json deleted file mode 100644 index acf40381..00000000 --- a/common/src/main/resources/data/antarchy/recipe/orange_dye_from_torchflower_bush.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "antarchy:torchflower_bush" - } - ], - "result": { - "count": 2, - "id": "minecraft:orange_dye" - } -} diff --git a/common/src/main/resources/data/antarchy/recipe/titanium/titanium_ingot_from_raw_titanium_blasting.json b/common/src/main/resources/data/antarchy/recipe/titanium/titanium_ingot_from_raw_titanium_blasting.json index e4d042a5..18262aea 100644 --- a/common/src/main/resources/data/antarchy/recipe/titanium/titanium_ingot_from_raw_titanium_blasting.json +++ b/common/src/main/resources/data/antarchy/recipe/titanium/titanium_ingot_from_raw_titanium_blasting.json @@ -7,6 +7,6 @@ "result": { "id": "antarchy:titanium_ingot" }, - "experience": 0.1, + "experience": 2.0, "cookingtime": 100 } diff --git a/common/src/main/resources/data/antarchy/recipe/titanium/titanium_ingot_from_raw_titanium_smelting.json b/common/src/main/resources/data/antarchy/recipe/titanium/titanium_ingot_from_raw_titanium_smelting.json index 041927b6..47855561 100644 --- a/common/src/main/resources/data/antarchy/recipe/titanium/titanium_ingot_from_raw_titanium_smelting.json +++ b/common/src/main/resources/data/antarchy/recipe/titanium/titanium_ingot_from_raw_titanium_smelting.json @@ -7,6 +7,6 @@ "result": { "id": "antarchy:titanium_ingot" }, - "experience": 0.1, + "experience": 2.0, "cookingtime": 200 } diff --git a/common/src/main/resources/data/antarchy/recipe/titanium/titanium_nugget_from_raw_titanium_scrap_blasting.json b/common/src/main/resources/data/antarchy/recipe/titanium/titanium_nugget_from_raw_titanium_scrap_blasting.json index 9309f320..03136581 100644 --- a/common/src/main/resources/data/antarchy/recipe/titanium/titanium_nugget_from_raw_titanium_scrap_blasting.json +++ b/common/src/main/resources/data/antarchy/recipe/titanium/titanium_nugget_from_raw_titanium_scrap_blasting.json @@ -7,6 +7,6 @@ "result": { "id": "antarchy:titanium_nugget" }, - "experience": 0.1, + "experience": 2.0, "cookingtime": 100 } diff --git a/common/src/main/resources/data/antarchy/recipe/titanium/titanium_nugget_from_raw_titanium_scrap_smelting.json b/common/src/main/resources/data/antarchy/recipe/titanium/titanium_nugget_from_raw_titanium_scrap_smelting.json index d06c3023..5761c6aa 100644 --- a/common/src/main/resources/data/antarchy/recipe/titanium/titanium_nugget_from_raw_titanium_scrap_smelting.json +++ b/common/src/main/resources/data/antarchy/recipe/titanium/titanium_nugget_from_raw_titanium_scrap_smelting.json @@ -7,6 +7,6 @@ "result": { "id": "antarchy:titanium_nugget" }, - "experience": 0.1, + "experience": 2.0, "cookingtime": 200 } diff --git a/common/src/main/resources/data/antarchy/recipe/uranium/uranium_ingot_from_raw_uranium_blasting.json b/common/src/main/resources/data/antarchy/recipe/uranium/uranium_ingot_from_raw_uranium_blasting.json index ce142114..a95c9764 100644 --- a/common/src/main/resources/data/antarchy/recipe/uranium/uranium_ingot_from_raw_uranium_blasting.json +++ b/common/src/main/resources/data/antarchy/recipe/uranium/uranium_ingot_from_raw_uranium_blasting.json @@ -7,6 +7,6 @@ "result": { "id": "antarchy:uranium_ingot" }, - "experience": 0.1, + "experience": 2.0, "cookingtime": 100 } diff --git a/common/src/main/resources/data/antarchy/recipe/uranium/uranium_ingot_from_raw_uranium_smelting.json b/common/src/main/resources/data/antarchy/recipe/uranium/uranium_ingot_from_raw_uranium_smelting.json index c6a2dcd1..dcf0d1da 100644 --- a/common/src/main/resources/data/antarchy/recipe/uranium/uranium_ingot_from_raw_uranium_smelting.json +++ b/common/src/main/resources/data/antarchy/recipe/uranium/uranium_ingot_from_raw_uranium_smelting.json @@ -7,6 +7,6 @@ "result": { "id": "antarchy:uranium_ingot" }, - "experience": 0.1, + "experience": 2.0, "cookingtime": 200 } diff --git a/common/src/main/resources/data/antarchy/recipe/uranium/uranium_nugget_from_raw_uranium_scrap_blasting.json b/common/src/main/resources/data/antarchy/recipe/uranium/uranium_nugget_from_raw_uranium_scrap_blasting.json index 4d79476b..a277c7a8 100644 --- a/common/src/main/resources/data/antarchy/recipe/uranium/uranium_nugget_from_raw_uranium_scrap_blasting.json +++ b/common/src/main/resources/data/antarchy/recipe/uranium/uranium_nugget_from_raw_uranium_scrap_blasting.json @@ -7,6 +7,6 @@ "result": { "id": "antarchy:uranium_nugget" }, - "experience": 0.1, + "experience": 2.0, "cookingtime": 100 } diff --git a/common/src/main/resources/data/antarchy/recipe/uranium/uranium_nugget_from_raw_uranium_scrap_smelting.json b/common/src/main/resources/data/antarchy/recipe/uranium/uranium_nugget_from_raw_uranium_scrap_smelting.json index 2e8b4ce3..5f8d9a95 100644 --- a/common/src/main/resources/data/antarchy/recipe/uranium/uranium_nugget_from_raw_uranium_scrap_smelting.json +++ b/common/src/main/resources/data/antarchy/recipe/uranium/uranium_nugget_from_raw_uranium_scrap_smelting.json @@ -7,6 +7,6 @@ "result": { "id": "antarchy:uranium_nugget" }, - "experience": 0.1, + "experience": 2.0, "cookingtime": 200 } diff --git a/common/src/main/resources/data/antarchy/tags/block/amber_moss_replaceable.json b/common/src/main/resources/data/antarchy/tags/block/amber_moss_replaceable.json deleted file mode 100644 index 7c1185df..00000000 --- a/common/src/main/resources/data/antarchy/tags/block/amber_moss_replaceable.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "#minecraft:moss_replaceable", - "antarchy:myrmite", - "antarchy:broodstone", - "antarchy:amber_moss_block" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/block/cavaryn_portal_frames.json b/common/src/main/resources/data/antarchy/tags/block/cavaryn_portal_frames.json deleted file mode 100644 index 2976b86e..00000000 --- a/common/src/main/resources/data/antarchy/tags/block/cavaryn_portal_frames.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "antarchy:myrmite" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/glimmer_food.json b/common/src/main/resources/data/antarchy/tags/item/glimmer_food.json new file mode 100644 index 00000000..6c67336b --- /dev/null +++ b/common/src/main/resources/data/antarchy/tags/item/glimmer_food.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:glow_berries", + "minecraft:sweet_berries", + "minecraft:apple", + "antarchy:ouranwood_acorn" + ] +} diff --git a/common/src/main/resources/data/antarchy/tags/item/hercules_beetle_food.json b/common/src/main/resources/data/antarchy/tags/item/hercules_beetle_food.json deleted file mode 100644 index 0f2f4352..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/hercules_beetle_food.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:glow_berries" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/rolly_polly_food.json b/common/src/main/resources/data/antarchy/tags/item/rolly_polly_food.json deleted file mode 100644 index 4c6d4e2a..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/rolly_polly_food.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:glow_berries", - "minecraft:sweet_berries" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/termite_activation_items.json b/common/src/main/resources/data/antarchy/tags/item/termite_activation_items.json deleted file mode 100644 index 90f5f079..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/termite_activation_items.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:stick" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/termite_breeding_foods.json b/common/src/main/resources/data/antarchy/tags/item/termite_breeding_foods.json deleted file mode 100644 index d280b15e..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/termite_breeding_foods.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:logs", - "#minecraft:planks", - "#minecraft:wooden_slabs", - "#minecraft:wooden_stairs", - "#minecraft:wooden_fences", - "#minecraft:fence_gates", - "#minecraft:wooden_doors", - "#minecraft:wooden_trapdoors", - "#minecraft:wooden_pressure_plates", - "#minecraft:wooden_buttons", - "minecraft:stick", - "minecraft:bowl", - "minecraft:ladder", - "minecraft:crafting_table", - "minecraft:chest", - "minecraft:barrel" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/termite_foods.json b/common/src/main/resources/data/antarchy/tags/item/termite_foods.json deleted file mode 100644 index 5d341ba2..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/termite_foods.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} diff --git a/common/src/main/resources/data/antarchy/tags/worldgen/biome/big_bush_2x2_spawn_biomes.json b/common/src/main/resources/data/antarchy/tags/worldgen/biome/big_bush_2x2_spawn_biomes.json deleted file mode 100644 index b251f336..00000000 --- a/common/src/main/resources/data/antarchy/tags/worldgen/biome/big_bush_2x2_spawn_biomes.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:taiga", - "minecraft:snowy_taiga", - "minecraft:dark_forest", - { "id": "#c:is_taiga", "required": false }, - { "id": "#c:is_dark_forest", "required": false } - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/worldgen/biome/big_bush_spawn_biomes.json b/common/src/main/resources/data/antarchy/tags/worldgen/biome/big_bush_spawn_biomes.json deleted file mode 100644 index 198449f3..00000000 --- a/common/src/main/resources/data/antarchy/tags/worldgen/biome/big_bush_spawn_biomes.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:forest", - "minecraft:birch_forest", - "minecraft:dark_forest" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/worldgen/biome/is_cavaryn.json b/common/src/main/resources/data/antarchy/tags/worldgen/biome/is_cavaryn.json deleted file mode 100644 index 34d6084e..00000000 --- a/common/src/main/resources/data/antarchy/tags/worldgen/biome/is_cavaryn.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "antarchy:cavaryn", - "antarchy:brooding_tunnels", - "antarchy:rolly_caves" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/worldgen/biome/mega_taiga_spawn_biomes.json b/common/src/main/resources/data/antarchy/tags/worldgen/biome/mega_taiga_spawn_biomes.json deleted file mode 100644 index 8ecd6505..00000000 --- a/common/src/main/resources/data/antarchy/tags/worldgen/biome/mega_taiga_spawn_biomes.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:old_growth_pine_taiga", - "minecraft:old_growth_spruce_taiga" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/worldgen/biome/very_short_grass_spawn_biomes.json b/common/src/main/resources/data/antarchy/tags/worldgen/biome/very_short_grass_spawn_biomes.json deleted file mode 100644 index 38d80f18..00000000 --- a/common/src/main/resources/data/antarchy/tags/worldgen/biome/very_short_grass_spawn_biomes.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:plains", - "minecraft:sunflower_plains", - "minecraft:meadow", - "minecraft:savanna", - "minecraft:forest", - "minecraft:flower_forest", - "minecraft:birch_forest", - "minecraft:dark_forest", - "minecraft:taiga", - "minecraft:snowy_taiga", - { "id": "#c:is_plains", "required": false }, - { "id": "#c:is_savanna", "required": false }, - { "id": "#c:is_forest", "required": false }, - { "id": "#c:is_taiga", "required": false } - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/worldgen/biome/very_tall_grass_spawn_biomes.json b/common/src/main/resources/data/antarchy/tags/worldgen/biome/very_tall_grass_spawn_biomes.json deleted file mode 100644 index ea87f09f..00000000 --- a/common/src/main/resources/data/antarchy/tags/worldgen/biome/very_tall_grass_spawn_biomes.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:plains", - "minecraft:savanna", - "minecraft:forest", - { "id": "#c:is_jungle", "required": false } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json b/common/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json deleted file mode 100644 index 1cb3d871..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "has_precipitation": false, - "temperature": 0.45, - "downfall": 0.0, - "effects": { - "fog_color": 655360, - "water_color": 327680, - "water_fog_color": 0, - "sky_color": 262144, - "grass_color": 2763554, - "foliage_color": 2763554, - "mood_sound": { - "sound": "minecraft:ambient.cave", - "tick_delay": 1200000, - "block_search_extent": 8, - "offset": 2.0 - }, - "particle": { - "probability": 0.003, - "options": { - "type": "antarchy:orange_ash" - } - } - }, - "spawn_costs": {}, - "carvers": { - "air": [], - "liquid": [] - }, - "features": [ - [], - [], - [], - [], - [], - [], - [], - [], - [ - "antarchy:cavaryn_bile_veins", - "antarchy:brooding_tunnels_creepvine" - ], - [ - "antarchy:cavaryn_bile_cysts" - ] - ], - "creature_spawn_probability": 0.06, - "spawners": { - "monster": [ - { - "type": "antarchy:jumpy_bug", - "weight": 95, - "minCount": 1, - "maxCount": 3 - }, - { - "type": "antarchy:spit_bug", - "weight": 95, - "minCount": 2, - "maxCount": 5 - } - ], - "creature": [ - ], - "ambient": [], - "axolotls": [], - "underground_water_creature": [], - "water_creature": [], - "water_ambient": [], - "misc": [] - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/cavaryn.json b/common/src/main/resources/data/antarchy/worldgen/biome/cavaryn.json deleted file mode 100644 index 4c7e0c44..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/biome/cavaryn.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "has_precipitation": false, - "temperature": 0.45, - "downfall": 0.0, - "effects": { - "fog_color": 983040, - "water_color": 327680, - "water_fog_color": 0, - "sky_color": 524288, - "grass_color": 4211262, - "foliage_color": 4211262, - "mood_sound": { - "sound": "minecraft:ambient.cave", - "tick_delay": 1200000, - "block_search_extent": 8, - "offset": 2.0 - }, - "particle": { - "probability": 0.002, - "options": { - "type": "antarchy:orange_ash" - } - } - }, - "spawn_costs": { - "antarchy:hercules_beetle": { - "energy_budget": 0.1, - "charge": 15 - } - }, - "carvers": { - "air": [], - "liquid": [] - }, - "features": [ - [], - [], - [], - [], - [], - [], - [], - [], - [ - "antarchy:cavaryn_bile_veins", - "antarchy:cavaryn_bile_cysts", - "antarchy:cavaryn_chiten_spikes", - "antarchy:cavaryn_terror_egg_patch", - "antarchy:cavaryn_wall_amber_moss", - "antarchy:cavaryn_creepvine" - ], - [ - ] - ], - "creature_spawn_probability": 0.06, - "spawners": { - "monster": [ - { - "type": "antarchy:creeping_horror", - "weight": 95, - "minCount": 2, - "maxCount": 5 - }, - { - "type": "antarchy:lurking_terror", - "weight": 95, - "minCount": 2, - "maxCount": 5 - }, - { - "type": "antarchy:hercules_beetle", - "weight": 5, - "minCount": 1, - "maxCount": 1 - } - ], - "creature": [ - { - "type": "antarchy:stink_bug", - "weight": 10, - "minCount": 1, - "maxCount": 3 - } - ], - "ambient": [ - ], - "axolotls": [], - "underground_water_creature": [], - "water_creature": [], - "water_ambient": [], - "misc": [] - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/elythia_meadow.json b/common/src/main/resources/data/antarchy/worldgen/biome/elythia_meadow.json index 455f2ff3..52a9652b 100644 --- a/common/src/main/resources/data/antarchy/worldgen/biome/elythia_meadow.json +++ b/common/src/main/resources/data/antarchy/worldgen/biome/elythia_meadow.json @@ -100,7 +100,7 @@ "weight": 16, "minCount": 1, "maxCount": 3 - } + }, ], "ambient": [ { diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/fungal_ouranwood_forest.json b/common/src/main/resources/data/antarchy/worldgen/biome/fungal_ouranwood_forest.json index 364f96e2..356f0ce0 100644 --- a/common/src/main/resources/data/antarchy/worldgen/biome/fungal_ouranwood_forest.json +++ b/common/src/main/resources/data/antarchy/worldgen/biome/fungal_ouranwood_forest.json @@ -84,7 +84,7 @@ "weight": 2, "minCount": 1, "maxCount": 2 - } + }, ], "ambient": [ { diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/ouranwood_forest.json b/common/src/main/resources/data/antarchy/worldgen/biome/ouranwood_forest.json index 04131d23..a9bc5c29 100644 --- a/common/src/main/resources/data/antarchy/worldgen/biome/ouranwood_forest.json +++ b/common/src/main/resources/data/antarchy/worldgen/biome/ouranwood_forest.json @@ -96,7 +96,7 @@ "weight": 4, "minCount": 1, "maxCount": 1 - } + }, ], "ambient": [ ], diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/rolly_caves.json b/common/src/main/resources/data/antarchy/worldgen/biome/rolly_caves.json deleted file mode 100644 index 07b15e9d..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/biome/rolly_caves.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "has_precipitation": false, - "temperature": 0.7, - "downfall": 0.6, - "effects": { - "fog_color": 4867366, - "water_color": 6591296, - "water_fog_color": 2440734, - "sky_color": 1710351, - "grass_color": 10275406, - "foliage_color": 10275406, - "mood_sound": { - "sound": "minecraft:ambient.cave", - "tick_delay": 60000, - "block_search_extent": 8, - "offset": 2.0 - }, - "particle": { - "probability": 0.004, - "options": { - "type": "minecraft:spore_blossom_air" - } - } - }, - "spawn_costs": {}, - "carvers": { - "air": [], - "liquid": [] - }, - "features": [ - [], - [ - "antarchy:rolly_caves_bile_pool" - ], - [], - [], - [], - [], - [], - [], - [], - [ - "minecraft:lush_caves_vegetation", - "minecraft:lush_caves_ceiling_vegetation", - "minecraft:cave_vines", - "minecraft:classic_vines_cave_feature", - "antarchy:rolly_caves_amber_moss_patch", - "antarchy:cavaryn_wall_amber_moss" - ], - [] - ], - "creature_spawn_probability": 0.08, - "spawners": { - "monster": [], - "creature": [ - { - "type": "antarchy:rolly_polly", - "weight": 20, - "minCount": 1, - "maxCount": 2 - } - ], - "ambient": [], - "axolotls": [], - "underground_water_creature": [], - "water_creature": [], - "water_ambient": [], - "misc": [] - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/sparse_ouranwood_forest.json b/common/src/main/resources/data/antarchy/worldgen/biome/sparse_ouranwood_forest.json index a1c23e95..6f0ff98e 100644 --- a/common/src/main/resources/data/antarchy/worldgen/biome/sparse_ouranwood_forest.json +++ b/common/src/main/resources/data/antarchy/worldgen/biome/sparse_ouranwood_forest.json @@ -1,102 +1,135 @@ { - "has_precipitation": false, - "temperature": 0.78, - "downfall": 0.95, - "effects": { - "fog_color": 8084735, - "water_color": 5021432, - "water_fog_color": 2502722, - "sky_color": 8084735, - "foliage_color": 2867501, - "grass_color": 4304168, - "grass_color_modifier": "none", - "particle": { - "probability": 0.009, - "options": { - "type": "minecraft:spore_blossom_air" - } - }, - "mood_sound": { - "sound": "minecraft:ambient.crimson_forest.mood", - "tick_delay": 6000, - "block_search_extent": 8, - "offset": 2.0 - } - }, - "spawn_costs": {}, - "carvers": { - "air": [], - "liquid": [] - }, - "features": [ - [], - [], - [], - [], - [], - [], - [ - "minecraft:ore_coal_upper", - "minecraft:ore_coal_lower", - "minecraft:ore_iron_upper", - "minecraft:ore_iron_middle", - "minecraft:ore_iron_small", - "minecraft:ore_gold", - "minecraft:ore_gold_lower", - "minecraft:ore_redstone", - "minecraft:ore_redstone_lower", - "minecraft:ore_diamond", - "minecraft:ore_diamond_medium", - "minecraft:ore_diamond_large", - "minecraft:ore_diamond_buried", - "minecraft:ore_lapis", - "minecraft:ore_lapis_buried", - "minecraft:ore_copper" - ], - [ - "antarchy:elythia_underground", - "minecraft:large_dripstone", - "minecraft:pointed_dripstone" - ], - [], - [ - "antarchy:ouranwood_trees_sparse", - "antarchy:elythia_forest_flora", - "antarchy:elythia_brown_ant_nests", - "antarchy:elythia_rainbow_ant_nests", - "antarchy:termite_nest" - ], - [] - ], - "creature_spawn_probability": 0.07, - "spawners": { - "monster": [], - "creature": [ - { - "type": "antarchy:caterpillar", - "weight": 5, - "minCount": 1, - "maxCount": 2 - }, - { - "type": "antarchy:flying_squirrel", - "weight": 2, - "minCount": 1, - "maxCount": 2 - } - ], - "ambient": [ - { - "type": "antarchy:butterfly", - "weight": 7, - "minCount": 1, - "maxCount": 2 - } - ], - "axolotls": [], - "underground_water_creature": [], - "water_creature": [], - "water_ambient": [], - "misc": [] - } + "has_precipitation": false, + "temperature": 0.78, + "downfall": 0.95, + "effects": { + "fog_color": 8084735, + "water_color": 5021432, + "water_fog_color": 2502722, + "sky_color": 8084735, + "foliage_color": 2867501, + "grass_color": 4304168, + "grass_color_modifier": "none", + "particle": { + "probability": 0.009, + "options": { + "type": "minecraft:spore_blossom_air" + } + }, + "mood_sound": { + "sound": "minecraft:ambient.crimson_forest.mood", + "tick_delay": 6000, + "block_search_extent": 8, + "offset": 2.0 + } + }, + "spawn_costs": { + + }, + "carvers": { + "air": [ + + ], + "liquid": [ + + ] + }, + "features": [ + [ + + ], + [ + + ], + [ + + ], + [ + + ], + [ + + ], + [ + + ], + [ + "minecraft:ore_coal_upper", + "minecraft:ore_coal_lower", + "minecraft:ore_iron_upper", + "minecraft:ore_iron_middle", + "minecraft:ore_iron_small", + "minecraft:ore_gold", + "minecraft:ore_gold_lower", + "minecraft:ore_redstone", + "minecraft:ore_redstone_lower", + "minecraft:ore_diamond", + "minecraft:ore_diamond_medium", + "minecraft:ore_diamond_large", + "minecraft:ore_diamond_buried", + "minecraft:ore_lapis", + "minecraft:ore_lapis_buried", + "minecraft:ore_copper" + ], + [ + "antarchy:elythia_underground", + "minecraft:large_dripstone", + "minecraft:pointed_dripstone" + ], + [ + + ], + [ + "antarchy:ouranwood_trees_sparse", + "antarchy:elythia_forest_flora", + "antarchy:elythia_brown_ant_nests", + "antarchy:elythia_rainbow_ant_nests" + ], + [ + + ] + ], + "creature_spawn_probability": 0.07, + "spawners": { + "monster": [ + + ], + "creature": [ + { + "type": "antarchy:caterpillar", + "weight": 5, + "minCount": 1, + "maxCount": 2 + }, + { + "type": "antarchy:flying_squirrel", + "weight": 2, + "minCount": 1, + "maxCount": 2 + }, + ], + "ambient": [ + { + "type": "antarchy:butterfly", + "weight": 7, + "minCount": 1, + "maxCount": 2 + } + ], + "axolotls": [ + + ], + "underground_water_creature": [ + + ], + "water_creature": [ + + ], + "water_ambient": [ + + ], + "misc": [ + + ] + } } diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_patch_bonemeal.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_patch_bonemeal.json deleted file mode 100644 index 0ba3323d..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_patch_bonemeal.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:vegetation_patch", - "config": { - "depth": 1, - "extra_bottom_block_chance": 0.0, - "extra_edge_column_chance": 0.75, - "ground_state": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "antarchy:amber_moss_block" - } - }, - "replaceable": "#antarchy:amber_moss_replaceable", - "surface": "floor", - "vegetation_chance": 0.6, - "vegetation_feature": { - "feature": "antarchy:amber_moss_vegetation", - "placement": [] - }, - "vertical_range": 5, - "xz_radius": { - "type": "minecraft:uniform", - "max_inclusive": 2, - "min_inclusive": 1 - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_vegetation.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_vegetation.json deleted file mode 100644 index f99e9268..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_vegetation.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "antarchy:amber_moss_carpet", - "Properties": { - "bottom": "true", - "east": "none", - "north": "none", - "south": "none", - "west": "none" - } - } - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush.json deleted file mode 100644 index 272aa3e5..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:random_patch", - "config": { - "tries": 1, - "xz_spread": 0, - "y_spread": 0, - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { "Name": "antarchy:big_bush" } - } - } - }, - "placement": [ - { - "type": "minecraft:block_predicate_filter", - "predicate": { "type": "minecraft:matching_blocks", "blocks": "minecraft:air" } - } - ] - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush_2x2.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush_2x2.json deleted file mode 100644 index 2029758a..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush_2x2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:big_bush_2x2", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush_3x3.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush_3x3.json deleted file mode 100644 index 281b8d6b..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/big_bush_3x3.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:big_bush_3x3", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_cysts.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_cysts.json deleted file mode 100644 index 1616e268..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_cysts.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_bile_cysts", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_veins.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_veins.json deleted file mode 100644 index 6a2a5e5d..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_veins.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_bile_veins", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_chiten_spikes.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_chiten_spikes.json deleted file mode 100644 index cb963a90..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_chiten_spikes.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "antarchy:cavaryn_chiten_spikes", - "config": { - "floor_to_ceiling_search_range": 10, - "radius": 4, - "max_column_height": 5, - "height_deviation": 1, - "chance_of_column_at_max_distance_from_center": 0.3, - "max_distance_from_center_affecting_chance_of_column": 4, - "max_distance_from_center_affecting_height_bias": 4, - "max_height_difference": 1, - "large_variant_chance": 0.35, - "large_variant_extra_radius": 3, - "large_variant_extra_height": 4, - "large_variant_extra_height_deviation": 2, - "large_variant_surface_spike_multiplier": 2.5 - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_creepvine.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_creepvine.json deleted file mode 100644 index 13d7a210..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_creepvine.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_creepvine", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_terror_egg_patch.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_terror_egg_patch.json deleted file mode 100644 index 76039ff0..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_terror_egg_patch.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_terror_egg_patch", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_wall_amber_moss.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_wall_amber_moss.json deleted file mode 100644 index f06cc5d9..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_wall_amber_moss.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_wall_amber_moss", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/rolly_caves_amber_moss_patch.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/rolly_caves_amber_moss_patch.json deleted file mode 100644 index 8458ed60..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/rolly_caves_amber_moss_patch.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "type": "minecraft:vegetation_patch", - "config": { - "surface": "floor", - "depth": 1, - "vertical_range": 5, - "extra_bottom_block_chance": 0.0, - "extra_edge_column_chance": 0.3, - "vegetation_chance": 0.7, - "xz_radius": { - "type": "minecraft:uniform", - "min_inclusive": 4, - "max_inclusive": 7 - }, - "replaceable": "#minecraft:moss_replaceable", - "ground_state": { - "type": "minecraft:weighted_state_provider", - "entries": [ - { - "weight": 3, - "data": { - "Name": "antarchy:amber_moss_block" - } - }, - { - "weight": 2, - "data": { - "Name": "minecraft:moss_block" - } - } - ] - }, - "vegetation_feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:weighted_state_provider", - "entries": [ - { - "weight": 4, - "data": { - "Name": "antarchy:amber_moss_carpet" - } - }, - { - "weight": 3, - "data": { - "Name": "minecraft:moss_carpet" - } - }, - { - "weight": 2, - "data": { - "Name": "minecraft:short_grass" - } - } - ] - } - } - }, - "placement": [] - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/termite_nest.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/termite_nest.json deleted file mode 100644 index f777d3bb..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/termite_nest.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "antarchy:termite_nest", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "antarchy:termite_nest", - "Properties": { - "facing": "north" - } - } - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/very_short_grass.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/very_short_grass.json deleted file mode 100644 index 74b3de49..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/very_short_grass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:random_patch", - "config": { - "tries": 6, - "xz_spread": 4, - "y_spread": 2, - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { "Name": "antarchy:very_short_grass" } - } - } - }, - "placement": [ - { - "type": "minecraft:block_predicate_filter", - "predicate": { "type": "minecraft:matching_blocks", "blocks": "minecraft:air" } - } - ] - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/very_tall_grass.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/very_tall_grass.json deleted file mode 100644 index 1b055669..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/very_tall_grass.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:very_tall_grass", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_custom.json b/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_custom.json deleted file mode 100644 index 02ada1e9..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_custom.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "type": "minecraft:add", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:cache_2d", - "argument": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:weird_scaled_sampler", - "input": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_modulator", - "xz_scale": 0.25, - "y_scale": 0.15 - }, - "noise": "antarchy:cavaryn", - "rarity_value_mapper": "type_2" - }, - "argument2": { - "type": "minecraft:mul", - "argument1": 0.123, - "argument2": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:add", - "argument1": -0.86, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.25, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_thickness", - "xz_scale": 1.2, - "y_scale": 1.5 - } - } - } - } - } - }, - "argument2": { - "type": "minecraft:cube", - "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:add", - "argument1": 0, - "argument2": { - "type": "minecraft:mul", - "argument1": 10, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_elevation", - "xz_scale": 0.8, - "y_scale": 0.4 - } - } - }, - "argument2": { - "type": "minecraft:y_clamped_gradient", - "from_y": 252, - "to_y": 8, - "from_value": 10, - "to_value": -10 - } - } - }, - "argument2": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:add", - "argument1": -0.86, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.25, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_thickness", - "xz_scale": 1.2, - "y_scale": 1.5 - } - } - } - } - } - } - }, - "max": 2.0, - "min": -2.0 - } - }, - "argument2": { - "type": "minecraft:cache_all_in_cell", - "argument": "antarchy:cavaryn_noise_cave" - } - }, - "argument2": -0.05 -} diff --git a/common/src/main/resources/data/antarchy/worldgen/noise_settings/cavaryn.json b/common/src/main/resources/data/antarchy/worldgen/noise_settings/cavaryn.json deleted file mode 100644 index 22fbb2c6..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/noise_settings/cavaryn.json +++ /dev/null @@ -1,213 +0,0 @@ -{ - "sea_level": 32, - "disable_mob_generation": false, - "aquifers_enabled": true, - "ore_veins_enabled": false, - "legacy_random_source": false, - "default_block": { - "Name": "antarchy:myrmite" - }, - "default_fluid": { - "Name": "antarchy:bile", - "Properties": { - "level": "0" - } - }, - "noise": { - "min_y": 0, - "height": 208, - "size_horizontal": 1, - "size_vertical": 2 - }, - "noise_router": { - "barrier": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_barrier", - "xz_scale": 1, - "y_scale": 0.5 - }, - "fluid_level_floodedness": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_floodedness", - "xz_scale": 1, - "y_scale": 0.67 - }, - "fluid_level_spread": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_spread", - "xz_scale": 1, - "y_scale": 0.7142857142857143 - }, - "lava": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_lava", - "xz_scale": 1, - "y_scale": 1 - }, - "temperature": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:temperature", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "vegetation": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:vegetation", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "continents": "minecraft:overworld/continents", - "erosion": "minecraft:overworld/erosion", - "depth": "minecraft:overworld/depth", - "ridges": "minecraft:overworld/ridges", - "initial_density_without_jaggedness": 0, - "final_density": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 0, - "to_y": 12, - "from_value": 4, - "to_value": -0.5 - }, - "argument2": { - "type": "minecraft:y_clamped_gradient", - "from_y": 196, - "to_y": 207, - "from_value": -0.5, - "to_value": 4 - } - }, - "argument2": { - "type": "minecraft:min", - "argument1": "minecraft:overworld/caves/noodle", - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": 4, - "max_exclusive": 204, - "when_in_range": "antarchy:cavaryn_custom", - "when_out_of_range": 2 - } - } - }, - "vein_toggle": 0, - "vein_ridged": 0, - "vein_gap": 0 - }, - "spawn_target": [ - { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -1, - 1 - ], - "erosion": [ - -1, - 1 - ], - "weirdness": [ - -1, - 1 - ], - "depth": 0, - "offset": 0 - } - ], - "surface_rule": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "add_stone_depth": false, - "anchor": { - "absolute": 5 - }, - "surface_depth_multiplier": 0 - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:bedrock" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "add_stone_depth": false, - "anchor": { - "below_top": 5 - }, - "surface_depth_multiplier": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:bedrock" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": ["antarchy:brooding_tunnels"] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "antarchy:broodstone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "add_stone_depth": false, - "anchor": { - "absolute": 40 - }, - "surface_depth_multiplier": 0 - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "antarchy:myrmite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "antarchy:myrmite" - } - } - ] - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush.json deleted file mode 100644 index 56f7137f..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "feature": "antarchy:big_bush", - "placement": [ - { "type": "minecraft:rarity_filter", "chance": 80 }, - { "type": "minecraft:in_square" }, - { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING" }, - { "type": "minecraft:biome" } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush_2x2.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush_2x2.json deleted file mode 100644 index 83ba475b..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush_2x2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "feature": "antarchy:big_bush_2x2", - "placement": [ - { "type": "minecraft:rarity_filter", "chance": 80 }, - { "type": "minecraft:in_square" }, - { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING" }, - { "type": "minecraft:biome" } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush_3x3.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush_3x3.json deleted file mode 100644 index 129ac93a..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/big_bush_3x3.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "feature": "antarchy:big_bush_3x3", - "placement": [ - { "type": "minecraft:rarity_filter", "chance": 5 }, - { "type": "minecraft:in_square" }, - { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING" }, - { "type": "minecraft:biome" } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/brooding_tunnels_creepvine.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/brooding_tunnels_creepvine.json deleted file mode 100644 index 61470bd2..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/brooding_tunnels_creepvine.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_creepvine", - "placement": [ - { - "type": "minecraft:count", - "count": 22 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_amber_moss_patch.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_amber_moss_patch.json deleted file mode 100644 index 702f99a5..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_amber_moss_patch.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:amber_moss_patch_bonemeal", - "placement": [ - { - "type": "minecraft:count", - "count": 2 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_cysts.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_cysts.json deleted file mode 100644 index ff189ab4..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_cysts.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_bile_cysts", - "placement": [ - { - "type": "minecraft:count", - "count": 1 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 8 - }, - "max_inclusive": { - "below_top": 16 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_veins.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_veins.json deleted file mode 100644 index b18f9af9..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_veins.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_bile_veins", - "placement": [ - { - "type": "minecraft:count", - "count": 2 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 8 - }, - "max_inclusive": { - "below_top": 16 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_chiten_spikes.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_chiten_spikes.json deleted file mode 100644 index f4e08187..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_chiten_spikes.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_chiten_spikes", - "placement": [ - { - "type": "minecraft:count", - "count": 3 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_creepvine.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_creepvine.json deleted file mode 100644 index f81d4998..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_creepvine.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_creepvine", - "placement": [ - { - "type": "minecraft:count", - "count": 18 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_terror_egg_patch.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_terror_egg_patch.json deleted file mode 100644 index 01c6693b..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_terror_egg_patch.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_terror_egg_patch", - "placement": [ - { - "type": "minecraft:count", - "count": 1 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 8 - }, - "max_inclusive": { - "below_top": 16 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_wall_amber_moss.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_wall_amber_moss.json deleted file mode 100644 index d7c131c3..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_wall_amber_moss.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_wall_amber_moss", - "placement": [ - { - "type": "minecraft:count", - "count": 10 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/rolly_caves_amber_moss_patch.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/rolly_caves_amber_moss_patch.json deleted file mode 100644 index b4347be6..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/rolly_caves_amber_moss_patch.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:rolly_caves_amber_moss_patch", - "placement": [ - { - "type": "minecraft:count", - "count": 40 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "absolute": 2 - }, - "max_inclusive": { - "absolute": 200 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json deleted file mode 100644 index 70a93fad..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "antarchy:termite_nest", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 88 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/very_short_grass.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/very_short_grass.json deleted file mode 100644 index ff350413..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/very_short_grass.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "feature": "antarchy:very_short_grass", - "placement": [ - { "type": "minecraft:rarity_filter", "chance": 1 }, - { "type": "minecraft:in_square" }, - { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING" }, - { "type": "minecraft:biome" } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/very_tall_grass.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/very_tall_grass.json deleted file mode 100644 index a514989f..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/very_tall_grass.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "feature": "antarchy:very_tall_grass", - "placement": [ - { "type": "minecraft:rarity_filter", "chance": 30 }, - { "type": "minecraft:in_square" }, - { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING" }, - { "type": "minecraft:biome" } - ] -} diff --git a/common/src/main/resources/data/c/tags/block/stones.json b/common/src/main/resources/data/c/tags/block/stones.json index 3da0bc9b..5df7f0b1 100644 --- a/common/src/main/resources/data/c/tags/block/stones.json +++ b/common/src/main/resources/data/c/tags/block/stones.json @@ -1,5 +1,5 @@ { - "values": [ - "antarchy:broodstone" - ] + "values": [ + + ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/climbable.json b/common/src/main/resources/data/minecraft/tags/block/climbable.json index 38a803c8..d0b4aadf 100644 --- a/common/src/main/resources/data/minecraft/tags/block/climbable.json +++ b/common/src/main/resources/data/minecraft/tags/block/climbable.json @@ -1,7 +1,6 @@ { - "replace": false, - "values": [ - "minecraft:vine", - "antarchy:creepvine" - ] + "replace": false, + "values": [ + "minecraft:vine" + ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/dirt.json b/common/src/main/resources/data/minecraft/tags/block/dirt.json index 62508263..857de3af 100644 --- a/common/src/main/resources/data/minecraft/tags/block/dirt.json +++ b/common/src/main/resources/data/minecraft/tags/block/dirt.json @@ -1,9 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:infested_rooted_dirt", - "antarchy:infested_coarse_dirt", - "antarchy:umbral_moss_block", - "antarchy:amber_moss_block" - ] + "replace": false, + "values": [ + "antarchy:infested_rooted_dirt", + "antarchy:infested_coarse_dirt", + "antarchy:umbral_moss_block" + ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/flowers.json b/common/src/main/resources/data/minecraft/tags/block/flowers.json index 0bf5c657..02f823bf 100644 --- a/common/src/main/resources/data/minecraft/tags/block/flowers.json +++ b/common/src/main/resources/data/minecraft/tags/block/flowers.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "antarchy:orange_milkweed", - "antarchy:pink_milkweed", - "antarchy:torchflower_bush" + "antarchy:pink_milkweed" ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json index 9c31b536..fe4bba56 100644 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json +++ b/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json @@ -1,10 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_leaves", - "antarchy:umbral_moss_block", - "antarchy:umbral_moss_carpet", - "antarchy:amber_moss_block", - "antarchy:amber_moss_carpet" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_leaves", + "antarchy:umbral_moss_block", + "antarchy:umbral_moss_carpet" + ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index 9c5a8624..aabf86b1 100644 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,79 +1,74 @@ { - "replace": false, - "values": [ - "antarchy:uranium_ore", - "antarchy:deepslate_uranium_ore", - "antarchy:titanium_ore", - "antarchy:deepslate_titanium_ore", - "antarchy:uranium_block", - "antarchy:cut_uranium", - "antarchy:cut_uranium_slab", - "antarchy:cut_uranium_stairs", - "antarchy:chiseled_uranium", - "antarchy:uranium_door", - "antarchy:uranium_trapdoor", - "antarchy:uranium_bars", - "antarchy:uranium_bulb", - "antarchy:titanium_block", - "antarchy:cut_titanium", - "antarchy:cut_titanium_slab", - "antarchy:cut_titanium_stairs", - "antarchy:chiseled_titanium", - "antarchy:titanium_door", - "antarchy:titanium_trapdoor", - "antarchy:titanium_bars", - "antarchy:titanium_bulb", - "antarchy:nyxite", - "antarchy:polished_nyxite", - "antarchy:chiseled_nyxite", - "antarchy:nyxite_bricks", - "antarchy:nyxite_stairs", - "antarchy:nyxite_slab", - "antarchy:nyxite_wall", - "antarchy:polished_nyxite_stairs", - "antarchy:polished_nyxite_slab", - "antarchy:polished_nyxite_wall", - "antarchy:nyxite_brick_stairs", - "antarchy:nyxite_brick_slab", - "antarchy:nyxite_brick_wall", - "antarchy:myrmite", - "antarchy:broodstone", - "antarchy:bile_vein", - "antarchy:chiten_block", - "antarchy:chiten_spike", - "antarchy:shellstone", - "antarchy:polished_shellstone", - "antarchy:shellstone_bricks", - "antarchy:chiseled_shellstone", - "antarchy:mossy_shellstone_bricks", - "antarchy:mossy_shellstone_brick_stairs", - "antarchy:mossy_shellstone_brick_slab", - "antarchy:mossy_shellstone_brick_wall", - "antarchy:cracked_shellstone_bricks", - "antarchy:shellstone_stairs", - "antarchy:shellstone_slab", - "antarchy:shellstone_wall", - "antarchy:polished_shellstone_stairs", - "antarchy:polished_shellstone_slab", - "antarchy:polished_shellstone_wall", - "antarchy:shellstone_brick_stairs", - "antarchy:shellstone_brick_slab", - "antarchy:shellstone_brick_wall", - "antarchy:nyxite_spike", - "antarchy:potent_nyxite", - "antarchy:blood_crystal_block", - "antarchy:budding_blood_crystal", - "antarchy:blood_crystal_cluster", - "antarchy:dream_sandstone", - "antarchy:chiseled_dream_sandstone", - "antarchy:cut_dream_sandstone", - "antarchy:smooth_dream_sandstone", - "antarchy:dream_sandstone_stairs", - "antarchy:dream_sandstone_slab", - "antarchy:dream_sandstone_wall", - "antarchy:smooth_dream_sandstone_stairs", - "antarchy:smooth_dream_sandstone_slab", - "antarchy:cut_dream_sandstone_slab", - "antarchy:red_ant_nest" - ] + "replace": false, + "values": [ + "antarchy:uranium_ore", + "antarchy:deepslate_uranium_ore", + "antarchy:titanium_ore", + "antarchy:deepslate_titanium_ore", + "antarchy:uranium_block", + "antarchy:cut_uranium", + "antarchy:cut_uranium_slab", + "antarchy:cut_uranium_stairs", + "antarchy:chiseled_uranium", + "antarchy:uranium_door", + "antarchy:uranium_trapdoor", + "antarchy:uranium_bars", + "antarchy:uranium_bulb", + "antarchy:titanium_block", + "antarchy:cut_titanium", + "antarchy:cut_titanium_slab", + "antarchy:cut_titanium_stairs", + "antarchy:chiseled_titanium", + "antarchy:titanium_door", + "antarchy:titanium_trapdoor", + "antarchy:titanium_bars", + "antarchy:titanium_bulb", + "antarchy:nyxite", + "antarchy:polished_nyxite", + "antarchy:chiseled_nyxite", + "antarchy:nyxite_bricks", + "antarchy:nyxite_stairs", + "antarchy:nyxite_slab", + "antarchy:nyxite_wall", + "antarchy:polished_nyxite_stairs", + "antarchy:polished_nyxite_slab", + "antarchy:polished_nyxite_wall", + "antarchy:nyxite_brick_stairs", + "antarchy:nyxite_brick_slab", + "antarchy:nyxite_brick_wall", + "antarchy:shellstone", + "antarchy:polished_shellstone", + "antarchy:shellstone_bricks", + "antarchy:chiseled_shellstone", + "antarchy:mossy_shellstone_bricks", + "antarchy:mossy_shellstone_brick_stairs", + "antarchy:mossy_shellstone_brick_slab", + "antarchy:mossy_shellstone_brick_wall", + "antarchy:cracked_shellstone_bricks", + "antarchy:shellstone_stairs", + "antarchy:shellstone_slab", + "antarchy:shellstone_wall", + "antarchy:polished_shellstone_stairs", + "antarchy:polished_shellstone_slab", + "antarchy:polished_shellstone_wall", + "antarchy:shellstone_brick_stairs", + "antarchy:shellstone_brick_slab", + "antarchy:shellstone_brick_wall", + "antarchy:nyxite_spike", + "antarchy:potent_nyxite", + "antarchy:blood_crystal_block", + "antarchy:budding_blood_crystal", + "antarchy:blood_crystal_cluster", + "antarchy:dream_sandstone", + "antarchy:chiseled_dream_sandstone", + "antarchy:cut_dream_sandstone", + "antarchy:smooth_dream_sandstone", + "antarchy:dream_sandstone_stairs", + "antarchy:dream_sandstone_slab", + "antarchy:dream_sandstone_wall", + "antarchy:smooth_dream_sandstone_stairs", + "antarchy:smooth_dream_sandstone_slab", + "antarchy:cut_dream_sandstone_slab", + "antarchy:red_ant_nest" + ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json b/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json index 33cea4cb..e1151ee0 100644 --- a/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json +++ b/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json @@ -1,25 +1,23 @@ { - "replace": false, - "values": [ - "antarchy:shellstone", - "antarchy:polished_shellstone", - "antarchy:shellstone_bricks", - "antarchy:chiseled_shellstone", - "antarchy:mossy_shellstone_bricks", - "antarchy:mossy_shellstone_brick_stairs", - "antarchy:mossy_shellstone_brick_slab", - "antarchy:mossy_shellstone_brick_wall", - "antarchy:cracked_shellstone_bricks", - "antarchy:shellstone_stairs", - "antarchy:shellstone_slab", - "antarchy:shellstone_wall", - "antarchy:polished_shellstone_stairs", - "antarchy:polished_shellstone_slab", - "antarchy:polished_shellstone_wall", - "antarchy:shellstone_brick_stairs", - "antarchy:shellstone_brick_slab", - "antarchy:shellstone_brick_wall", - "antarchy:chiten_block", - "antarchy:bile_vein" - ] + "replace": false, + "values": [ + "antarchy:shellstone", + "antarchy:polished_shellstone", + "antarchy:shellstone_bricks", + "antarchy:chiseled_shellstone", + "antarchy:mossy_shellstone_bricks", + "antarchy:mossy_shellstone_brick_stairs", + "antarchy:mossy_shellstone_brick_slab", + "antarchy:mossy_shellstone_brick_wall", + "antarchy:cracked_shellstone_bricks", + "antarchy:shellstone_stairs", + "antarchy:shellstone_slab", + "antarchy:shellstone_wall", + "antarchy:polished_shellstone_stairs", + "antarchy:polished_shellstone_slab", + "antarchy:polished_shellstone_wall", + "antarchy:shellstone_brick_stairs", + "antarchy:shellstone_brick_slab", + "antarchy:shellstone_brick_wall" + ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/sword_efficient.json b/common/src/main/resources/data/minecraft/tags/block/sword_efficient.json index 54f81cf6..5d341ba2 100644 --- a/common/src/main/resources/data/minecraft/tags/block/sword_efficient.json +++ b/common/src/main/resources/data/minecraft/tags/block/sword_efficient.json @@ -1,8 +1,4 @@ { "replace": false, - "values": [ - "antarchy:big_bush", - "antarchy:big_bush_part", - "antarchy:very_short_grass" - ] + "values": [] } diff --git a/common/src/main/resources/data/minecraft/tags/block/tall_flowers.json b/common/src/main/resources/data/minecraft/tags/block/tall_flowers.json index 0bf5c657..02f823bf 100644 --- a/common/src/main/resources/data/minecraft/tags/block/tall_flowers.json +++ b/common/src/main/resources/data/minecraft/tags/block/tall_flowers.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "antarchy:orange_milkweed", - "antarchy:pink_milkweed", - "antarchy:torchflower_bush" + "antarchy:pink_milkweed" ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/vines.json b/common/src/main/resources/data/minecraft/tags/block/vines.json index 38a803c8..d0b4aadf 100644 --- a/common/src/main/resources/data/minecraft/tags/block/vines.json +++ b/common/src/main/resources/data/minecraft/tags/block/vines.json @@ -1,7 +1,6 @@ { - "replace": false, - "values": [ - "minecraft:vine", - "antarchy:creepvine" - ] + "replace": false, + "values": [ + "minecraft:vine" + ] } diff --git a/common/src/main/resources/data/minecraft/tags/entity_type/arthropod.json b/common/src/main/resources/data/minecraft/tags/entity_type/arthropod.json index 26157504..4cecc517 100644 --- a/common/src/main/resources/data/minecraft/tags/entity_type/arthropod.json +++ b/common/src/main/resources/data/minecraft/tags/entity_type/arthropod.json @@ -1,21 +1,15 @@ { - "values": [ - "antarchy:brown_ant", - "antarchy:red_ant", - "antarchy:rainbow_ant", - "antarchy:caterpillar", - "antarchy:butterfly", - "antarchy:brutalfly", - "antarchy:bed_bug", - "antarchy:mantis", - "antarchy:alpha_mantis", - "antarchy:jumpy_bug", - "antarchy:spit_bug", - "antarchy:stink_bug", - "antarchy:hercules_beetle", - "antarchy:creeping_horror", - "antarchy:lurking_terror", + "values": [ + "antarchy:brown_ant", + "antarchy:red_ant", + "antarchy:rainbow_ant", + "antarchy:caterpillar", + "antarchy:butterfly", + "antarchy:brutalfly", + "antarchy:bed_bug", + "antarchy:mantis", + "antarchy:alpha_mantis", "antarchy:scorpion", - "antarchy:emperor_scorpion" - ] + "antarchy:emperor_scorpion" + ] } diff --git a/common/src/main/resources/data/minecraft/tags/item/dirt.json b/common/src/main/resources/data/minecraft/tags/item/dirt.json index 62508263..857de3af 100644 --- a/common/src/main/resources/data/minecraft/tags/item/dirt.json +++ b/common/src/main/resources/data/minecraft/tags/item/dirt.json @@ -1,9 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:infested_rooted_dirt", - "antarchy:infested_coarse_dirt", - "antarchy:umbral_moss_block", - "antarchy:amber_moss_block" - ] + "replace": false, + "values": [ + "antarchy:infested_rooted_dirt", + "antarchy:infested_coarse_dirt", + "antarchy:umbral_moss_block" + ] } diff --git a/common/src/main/resources/data/minecraft/tags/item/flowers.json b/common/src/main/resources/data/minecraft/tags/item/flowers.json index 0bf5c657..02f823bf 100644 --- a/common/src/main/resources/data/minecraft/tags/item/flowers.json +++ b/common/src/main/resources/data/minecraft/tags/item/flowers.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "antarchy:orange_milkweed", - "antarchy:pink_milkweed", - "antarchy:torchflower_bush" + "antarchy:pink_milkweed" ] } diff --git a/common/src/main/resources/data/minecraft/tags/item/tall_flowers.json b/common/src/main/resources/data/minecraft/tags/item/tall_flowers.json index 0bf5c657..02f823bf 100644 --- a/common/src/main/resources/data/minecraft/tags/item/tall_flowers.json +++ b/common/src/main/resources/data/minecraft/tags/item/tall_flowers.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "antarchy:orange_milkweed", - "antarchy:pink_milkweed", - "antarchy:torchflower_bush" + "antarchy:pink_milkweed" ] } diff --git a/common/src/main/resources/data/minecraft/tags/item/vines.json b/common/src/main/resources/data/minecraft/tags/item/vines.json index 38a803c8..d0b4aadf 100644 --- a/common/src/main/resources/data/minecraft/tags/item/vines.json +++ b/common/src/main/resources/data/minecraft/tags/item/vines.json @@ -1,7 +1,6 @@ { - "replace": false, - "values": [ - "minecraft:vine", - "antarchy:creepvine" - ] + "replace": false, + "values": [ + "minecraft:vine" + ] } diff --git a/fabric/build.gradle b/fabric/build.gradle index dbc656d2..56f8f8a1 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -42,6 +42,13 @@ dependencies { compileOnly(files("$rootDir/infinite_dimensions_jars/cloth-config-15.0.140-fabric.jar")) compileOnly(files("$rootDir/infinite_dimensions_jars/sable-neoforge-1.21.1-2.0.3.jar")) + // Compile against the NeoForge jar (official Mojang mappings, matches this module's compile + // space) but load the real Fabric jar at runtime — sizeable_foliage's Fabric jar ships + // intermediary-mapped (Fabric's normal shipping format) which this compileOnly classpath + // can't resolve directly. + compileOnly(files("$rootDir/sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar")) + runtimeOnly(files("$rootDir/sizeable_foliage_jars/sizeable_foliage-fabric-1.21.1-1.0.0.jar")) + annotationProcessor "org.spongepowered:mixin:0.8.7:processor" common(project(path: ':common', configuration: 'namedElements')) { transitive false } shadowCommon(project(path: ':common', configuration: 'namedElements')) { transitive false } diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabric.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabric.java index 304a1d49..569179f7 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabric.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabric.java @@ -38,50 +38,10 @@ public final class AntarchyFabric implements ModInitializer { Registries.BIOME, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "mantis_overworld_spawn_biomes") ); - private static final TagKey VERY_SHORT_GRASS_SPAWN_BIOMES = TagKey.create( - Registries.BIOME, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_short_grass_spawn_biomes") - ); - private static final TagKey VERY_TALL_GRASS_SPAWN_BIOMES = TagKey.create( - Registries.BIOME, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_tall_grass_spawn_biomes") - ); - private static final TagKey BIG_BUSH_SPAWN_BIOMES = TagKey.create( - Registries.BIOME, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush_spawn_biomes") - ); - private static final TagKey BIG_BUSH_2X2_SPAWN_BIOMES = TagKey.create( - Registries.BIOME, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush_2x2_spawn_biomes") - ); - private static final TagKey MEGA_TAIGA_SPAWN_BIOMES = TagKey.create( - Registries.BIOME, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "mega_taiga_spawn_biomes") - ); - private static final ResourceKey VERY_SHORT_GRASS_FEATURE = ResourceKey.create( - Registries.PLACED_FEATURE, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_short_grass") - ); - private static final ResourceKey VERY_TALL_GRASS_FEATURE = ResourceKey.create( - Registries.PLACED_FEATURE, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_tall_grass") - ); - private static final ResourceKey BIG_BUSH_FEATURE = ResourceKey.create( - Registries.PLACED_FEATURE, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush") - ); - private static final ResourceKey BIG_BUSH_2X2_FEATURE = ResourceKey.create( - Registries.PLACED_FEATURE, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush_2x2") - ); - private static final ResourceKey BIG_BUSH_3X3_FEATURE = ResourceKey.create( - Registries.PLACED_FEATURE, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush_3x3") - ); - @Override public void onInitialize() { AntarchyFabricNetworking.register(); + AntarchyFabricNetworking.bootstrapMultipartCommon(); AntarchyConfigModuleFabric.init(); AntarchyFabricContent.register(); registerWorldgenFeatures(); @@ -131,30 +91,5 @@ public final class AntarchyFabric implements ModInitializer { AntarchyFabricContent.ALPHA_MANTIS.get(), 1, 1, 1 ); - BiomeModifications.addFeature( - BiomeSelectors.tag(VERY_SHORT_GRASS_SPAWN_BIOMES), - GenerationStep.Decoration.VEGETAL_DECORATION, - VERY_SHORT_GRASS_FEATURE - ); - BiomeModifications.addFeature( - BiomeSelectors.tag(VERY_TALL_GRASS_SPAWN_BIOMES), - GenerationStep.Decoration.VEGETAL_DECORATION, - VERY_TALL_GRASS_FEATURE - ); - BiomeModifications.addFeature( - BiomeSelectors.tag(BIG_BUSH_SPAWN_BIOMES), - GenerationStep.Decoration.VEGETAL_DECORATION, - BIG_BUSH_FEATURE - ); - BiomeModifications.addFeature( - BiomeSelectors.tag(BIG_BUSH_2X2_SPAWN_BIOMES), - GenerationStep.Decoration.VEGETAL_DECORATION, - BIG_BUSH_2X2_FEATURE - ); - BiomeModifications.addFeature( - BiomeSelectors.tag(MEGA_TAIGA_SPAWN_BIOMES), - GenerationStep.Decoration.VEGETAL_DECORATION, - BIG_BUSH_3X3_FEATURE - ); } } diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java index 7a41c0bc..46cd1697 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java @@ -76,8 +76,6 @@ import com.craisinlord.antarchy.content.item.LucidPearlItem; import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity; import com.craisinlord.antarchy.content.entity.ToreterrorEntity; import com.craisinlord.antarchy.content.entity.WaterBombEntity; -import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity; -import com.craisinlord.antarchy.content.entity.LurkingTerrorEntity; import com.craisinlord.antarchy.content.item.PrimordialArmorItem; import com.craisinlord.antarchy.content.item.WaterCannonItem; import com.craisinlord.antarchy.content.entity.kraken.KrakenEntity; @@ -86,15 +84,12 @@ import com.craisinlord.antarchy.content.entity.MolevoreEntity; import com.craisinlord.antarchy.content.entity.MolewormEntity; import com.craisinlord.antarchy.content.entity.BomberEntity; import com.craisinlord.antarchy.content.entity.SizeRayProjectileEntity; -import com.craisinlord.antarchy.content.entity.SpitBugEntity; -import com.craisinlord.antarchy.content.entity.SpitBugProjectileEntity; import com.craisinlord.antarchy.content.entity.TriffidEntity; import com.craisinlord.antarchy.content.entity.WaspEntity; import com.craisinlord.antarchy.content.entity.ant.BaseAntEntity; import com.craisinlord.antarchy.content.entity.ant.BrownAntEntity; import com.craisinlord.antarchy.content.entity.ant.RainbowAntEntity; import com.craisinlord.antarchy.content.entity.ant.RedAntEntity; -import com.craisinlord.antarchy.content.entity.ant.TermiteEntity; import com.craisinlord.antarchy.content.item.BattleAxeItem; import com.craisinlord.antarchy.content.item.BasiliskDaggerItem; import com.craisinlord.antarchy.content.item.BigBerthaItem; @@ -528,30 +523,6 @@ public final class AntarchyFabricContent { () -> new MilkweedBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.PEONY))); public static final DeferredBlock PINK_MILKWEED = BLOCKS.register("pink_milkweed", () -> new MilkweedBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.PEONY))); - public static final DeferredBlock TORCHFLOWER_BUSH = BLOCKS.register("torchflower_bush", - () -> new TorchflowerBushBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.PEONY) - .lightLevel(state -> AntarchySettings.glowingTorchflowers() ? 15 : 0))); - public static final DeferredBlock VERY_SHORT_GRASS = BLOCKS.register("very_short_grass", - () -> new VeryShortGrassBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SHORT_GRASS))); - public static final DeferredBlock VERY_TALL_GRASS = BLOCKS.register("very_tall_grass", - () -> new VeryTallGrassBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TALL_GRASS))); - public static final DeferredBlock BIG_BUSH = BLOCKS.register("big_bush", - () -> new BigBushBlock(BlockBehaviour.Properties.of() - .mapColor(net.minecraft.world.level.material.MapColor.PLANT) - .noCollission() - .instabreak() - .sound(net.minecraft.world.level.block.SoundType.GRASS) - .ignitedByLava() - .pushReaction(net.minecraft.world.level.material.PushReaction.DESTROY))); - public static final DeferredBlock BIG_BUSH_PART = BLOCKS.register("big_bush_part", - () -> new BigBushPartBlock(BlockBehaviour.Properties.of() - .mapColor(net.minecraft.world.level.material.MapColor.PLANT) - .noCollission() - .instabreak() - .sound(net.minecraft.world.level.block.SoundType.GRASS) - .ignitedByLava() - .pushReaction(net.minecraft.world.level.material.PushReaction.DESTROY) - .noLootTable())); public static final DeferredBlock OURANWOOD_SIGN = BLOCKS.register("ouranwood_sign", () -> new net.minecraft.world.level.block.StandingSignBlock(OuranwoodWoodTypes.OURANWOOD, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_SIGN))); public static final DeferredBlock OURANWOOD_WALL_SIGN = BLOCKS.register("ouranwood_wall_sign", @@ -645,39 +616,19 @@ public final class AntarchyFabricContent { () -> new AntDimensionPortalBlock(PermanentPortalType.ELYTHIA, portalProperties())); public static final DeferredBlock THORAXIS_PORTAL = BLOCKS.register("thoraxis_portal", () -> new AntDimensionPortalBlock(PermanentPortalType.THORAXIS, portalProperties())); - public static final DeferredBlock CAVARYN_PORTAL = BLOCKS.register("cavaryn_portal", - () -> new AntDimensionPortalBlock(PermanentPortalType.CAVARYN, portalProperties())); public static final DeferredBlock PALE_NYXITE = BLOCKS.register("pale_nyxite", () -> new Block(nyxiteProperties())); public static final DeferredBlock NYXITE_SPIKE = BLOCKS.register("nyxite_spike", () -> new NyxiteSpikeBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POINTED_DRIPSTONE))); - public static final DeferredBlock CHITEN_SPIKE = BLOCKS.register("chiten_spike", - () -> new ChitenSpikeBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POINTED_DRIPSTONE))); public static final DeferredBlock POTENT_NYXITE = BLOCKS.register("potent_nyxite", () -> new PotentNyxiteBlock( AntarchyFabricContent::potentNyxiteBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERRACK).lightLevel(state -> 3) )); - public static final DeferredBlock MYRMITE = BLOCKS.register("myrmite", - () -> new Block(nyxiteProperties())); - public static final DeferredBlock BROODSTONE = BLOCKS.register("broodstone", - () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.DEEPSLATE).requiresCorrectToolForDrops())); - public static final DeferredBlock CHITEN_BLOCK = BLOCKS.register("chiten_block", - () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BONE_BLOCK).requiresCorrectToolForDrops())); public static final DeferredBlock UMBRAL_MOSS_BLOCK = BLOCKS.register("umbral_moss_block", () -> new UmbralMossBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_BLOCK))); public static final DeferredBlock UMBRAL_MOSS_CARPET = BLOCKS.register("umbral_moss_carpet", () -> new UmbralMossCarpetBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_CARPET).noOcclusion())); - public static final DeferredBlock AMBER_MOSS_BLOCK = BLOCKS.register("amber_moss_block", - () -> new AmberMossBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_BLOCK))); - public static final DeferredBlock AMBER_MOSS_CARPET = BLOCKS.register("amber_moss_carpet", - () -> new UmbralMossCarpetBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_CARPET).noOcclusion())); - public static final DeferredBlock AMBER_LICHEN = BLOCKS.register("amber_lichen", - () -> new GlowLichenBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.GLOW_LICHEN).lightLevel(state -> 4))); - public static final DeferredBlock BILE_VEIN = BLOCKS.register("bile_vein", - () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERRACK))); - public static final DeferredBlock CREEPVINE = BLOCKS.register("creepvine", - () -> new VineBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.VINE))); public static final DeferredHolder, SimpleParticleType> DREAM_FIRE_FLAME = PARTICLE_TYPES.register("dream_fire_flame", () -> simpleParticleType()); public static final DeferredHolder, SimpleParticleType> STINKY_GAS = PARTICLE_TYPES.register("stinky_gas", @@ -716,22 +667,6 @@ public final class AntarchyFabricContent { () -> new DreamFireBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SOUL_FIRE))); public static final DeferredBlock DREAM_CEILING_FIRE = BLOCKS.register("dream_fire_ceiling", () -> new DreamCeilingFireBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SOUL_FIRE))); - public static final DeferredBlock CREEPING_HORROR_EGG = BLOCKS.register("creeping_horror_egg", - () -> new CreepingHorrorEggBlock(BlockBehaviour.Properties.of() - .strength(0.15F) - .sound(SoundType.METAL) - .randomTicks() - .noOcclusion() - .noCollission() - .replaceable())); - public static final DeferredBlock LURKING_TERROR_EGG = BLOCKS.register("lurking_terror_egg", - () -> new LurkingTerrorEggBlock(BlockBehaviour.Properties.of() - .strength(0.15F) - .sound(SoundType.METAL) - .randomTicks() - .noOcclusion() - .noCollission() - .replaceable())); public static final DeferredBlock BED_BUG_EGG = BLOCKS.register("bed_bug_egg", () -> new BedBugEggBlock(BlockBehaviour.Properties.of() .strength(0.15F) @@ -771,6 +706,7 @@ public final class AntarchyFabricContent { () -> new Potion("stinky", new MobEffectInstance(mobEffectHolder(STINKY), 2400))); public static final DeferredHolder SHRINKING_EFFECT = MOB_EFFECTS.register("shrinking", ShrinkMobEffect::new); public static final DeferredHolder GROWTH_EFFECT = MOB_EFFECTS.register("growth", GrowthMobEffect::new); + // public static final DeferredHolder GLIMMERS_GRACE = MOB_EFFECTS.register("glimmers_grace", com.craisinlord.antarchy.content.effect.GlimmersGraceMobEffect::new); public static final DeferredHolder PARALYSIS = POTIONS.register("paralysis", () -> new Potion(new MobEffectInstance(mobEffectHolder(PARALYZED), 200))); public static final DeferredHolder LONG_PARALYSIS = POTIONS.register("long_paralysis", @@ -850,8 +786,6 @@ public final class AntarchyFabricContent { () -> buildAntType(BrownAntEntity::new, MobCategory.CREATURE, "brown_ant")); public static final DeferredHolder, EntityType> RAINBOW_ANT = ENTITY_TYPES.register("rainbow_ant", () -> buildAntType(RainbowAntEntity::new, MobCategory.CREATURE, "rainbow_ant")); - public static final DeferredHolder, EntityType> TERMITE = ENTITY_TYPES.register("termite", - () -> buildAntType(TermiteEntity::new, MobCategory.CREATURE, "termite")); public static final DeferredHolder, EntityType> MOLEWORM = ENTITY_TYPES.register("moleworm", () -> EntityType.Builder.of(MolewormEntity::new, MobCategory.MONSTER) .sized(0.4F, 0.3F) @@ -867,11 +801,6 @@ public final class AntarchyFabricContent { .sized(4.25F, 3.35F) .clientTrackingRange(10) .build("alpha_mantis")); - public static final DeferredHolder, EntityType> ROLLY_POLLY = ENTITY_TYPES.register("rolly_polly", - () -> EntityType.Builder.of(RollyPollyEntity::new, MobCategory.CREATURE) - .sized(0.95F, 0.85F) - .clientTrackingRange(10) - .build("rolly_polly")); public static final DeferredHolder, EntityType> OURANWOOD_BOAT_ENTITY = ENTITY_TYPES.register("ouranwood_boat", () -> EntityType.Builder.of(OuranwoodBoatEntity::new, MobCategory.MISC) .sized(1.375F, 0.5625F) @@ -899,11 +828,6 @@ public final class AntarchyFabricContent { .sized(1.15F, 0.8F) .clientTrackingRange(8) .build("bed_bug")); - public static final DeferredHolder, EntityType> STINK_BUG = ENTITY_TYPES.register("stink_bug", - () -> EntityType.Builder.of(StinkBugEntity::new, MobCategory.CREATURE) - .sized(0.35F, 0.2F) - .clientTrackingRange(8) - .build("stink_bug")); public static final DeferredHolder, EntityType> WASP = ENTITY_TYPES.register("wasp", () -> EntityType.Builder.of(WaspEntity::new, MobCategory.MONSTER) .sized(0.8625F, 1.365F) @@ -914,22 +838,6 @@ public final class AntarchyFabricContent { .sized(0.55F, 0.75F) .clientTrackingRange(8) .build("bomber")); - public static final DeferredHolder, EntityType> JUMPY_BUG = ENTITY_TYPES.register("jumpy_bug", - () -> EntityType.Builder.of(JumpyBugEntity::new, MobCategory.MONSTER) - .sized(3.0F, 3.0F) - .clientTrackingRange(8) - .build("jumpy_bug")); - public static final DeferredHolder, EntityType> SPIT_BUG = ENTITY_TYPES.register("spit_bug", - () -> EntityType.Builder.of(SpitBugEntity::new, MobCategory.MONSTER) - .sized(2.5F, 3.0F) - .clientTrackingRange(10) - .build("spit_bug")); - public static final DeferredHolder, EntityType> SPIT_BUG_PROJECTILE = ENTITY_TYPES.register("spit_bug_projectile", - () -> EntityType.Builder.of(SpitBugProjectileEntity::new, MobCategory.MISC) - .sized(0.5F, 0.5F) - .clientTrackingRange(8) - .updateInterval(1) - .build("spit_bug_projectile")); public static final DeferredHolder, EntityType> SHRINK_RAY_PROJECTILE = ENTITY_TYPES.register("shrink_ray_projectile", () -> EntityType.Builder.of(SizeRayProjectileEntity::createShrink, MobCategory.MISC) .sized(0.5F, 0.5F) @@ -953,8 +861,6 @@ public final class AntarchyFabricContent { () -> new AntNestBlock(BROWN_ANT, AntarchyFabricContent::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); public static final DeferredBlock RAINBOW_ANT_NEST = BLOCKS.register("rainbow_ant_nest", () -> new AntNestBlock(RAINBOW_ANT, AntarchyFabricContent::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); - public static final DeferredBlock TERMITE_NEST = BLOCKS.register("termite_nest", - () -> new AntNestBlock(TERMITE, AntarchyFabricContent::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); public static final DeferredBlock URANIUM_ORE = BLOCKS.register("uranium_ore", () -> createOre(Blocks.EMERALD_ORE, 4, 8)); public static final DeferredBlock DEEPSLATE_URANIUM_ORE = BLOCKS.register("deepslate_uranium_ore", @@ -1063,8 +969,7 @@ public final class AntarchyFabricContent { AntNestBlockEntity::new, RED_ANT_NEST.get(), BROWN_ANT_NEST.get(), - RAINBOW_ANT_NEST.get(), - TERMITE_NEST.get() + RAINBOW_ANT_NEST.get() ).build(null)); public static final DeferredHolder, BlockEntityType> DREAM_CAMPFIRE_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("dream_campfire", () -> BlockEntityType.Builder.of( @@ -1092,8 +997,6 @@ public final class AntarchyFabricContent { () -> new BrownAntNestFeature(SimpleBlockConfiguration.CODEC)); public static final DeferredHolder, RainbowAntNestFeature> RAINBOW_ANT_NEST_FEATURE = FEATURES.register("rainbow_ant_nest", () -> new RainbowAntNestFeature(SimpleBlockConfiguration.CODEC)); - public static final DeferredHolder, TermiteNestFeature> TERMITE_NEST_FEATURE = FEATURES.register("termite_nest", - () -> new TermiteNestFeature(SimpleBlockConfiguration.CODEC)); public static final DeferredHolder, OuranwoodTreeFeature> OURANWOOD_LARGE_TREE = FEATURES.register("ouranwood_large_tree", () -> new OuranwoodTreeFeature(OuranwoodTreeConfiguration.CODEC)); public static final DeferredHolder, OuranwoodTreeFeature> OURANWOOD_YOUNG_TREE = FEATURES.register("ouranwood_young_tree", @@ -1114,12 +1017,6 @@ public final class AntarchyFabricContent { () -> new ElythiaFloraFeature(NoneFeatureConfiguration.CODEC, ElythiaFloraFeature.Variant.TORCHFLOWER_FIELDS)); public static final DeferredHolder, ElythiaSurfaceCoverFeature> ELYTHIA_SURFACE_COVER = FEATURES.register("elythia_surface_cover", () -> new ElythiaSurfaceCoverFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.VeryTallGrassWorldgenFeature> VERY_TALL_GRASS_FEATURE = FEATURES.register("very_tall_grass", - () -> new com.craisinlord.antarchy.content.worldgen.VeryTallGrassWorldgenFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature> BIG_BUSH_2X2_FEATURE = FEATURES.register("big_bush_2x2", - () -> new com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature(NoneFeatureConfiguration.CODEC, 1)); - public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature> BIG_BUSH_3X3_FEATURE = FEATURES.register("big_bush_3x3", - () -> new com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature(NoneFeatureConfiguration.CODEC, 2)); public static final DeferredHolder, ElythiaUndergroundFeature> ELYTHIA_UNDERGROUND = FEATURES.register("elythia_underground", () -> new ElythiaUndergroundFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, BrutalflyCocoonFeature> BRUTALFLY_COCOON = FEATURES.register("brutalfly_cocoon", @@ -1152,16 +1049,6 @@ public final class AntarchyFabricContent { () -> new ThoraxisSpikeFeature(ThoraxisSpikeConfiguration.CODEC)); public static final DeferredHolder, NyxiteSpikeFeature> NYXITE_SPIKES = FEATURES.register("nyxite_spikes", () -> new NyxiteSpikeFeature(NyxiteSpikeConfiguration.CODEC)); - public static final DeferredHolder, ChitenSpikeFeature> CAVARYN_CHITEN_SPIKES = FEATURES.register("cavaryn_chiten_spikes", - () -> new ChitenSpikeFeature(ChitenSpikeConfiguration.CODEC)); - public static final DeferredHolder, CavarynBileVeinFeature> CAVARYN_BILE_VEINS = FEATURES.register("cavaryn_bile_veins", - () -> new CavarynBileVeinFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynBileCystFeature> CAVARYN_BILE_CYSTS = FEATURES.register("cavaryn_bile_cysts", - () -> new CavarynBileCystFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynCreepvineFeature> CAVARYN_CREEPVINE = FEATURES.register("cavaryn_creepvine", - () -> new CavarynCreepvineFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynWallAmberMossFeature> CAVARYN_WALL_AMBER_MOSS = FEATURES.register("cavaryn_wall_amber_moss", - () -> new CavarynWallAmberMossFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, AntiwaterSpringsFeature> ANTIWATER_SPRINGS = FEATURES.register("antiwater_springs", () -> new AntiwaterSpringsFeature(AntiwaterSpringsConfiguration.CODEC)); public static final DeferredHolder, PotentNyxiteFeature> POTENT_NYXITE_FEATURE = FEATURES.register("potent_nyxite", @@ -1174,8 +1061,6 @@ public final class AntarchyFabricContent { () -> new BedBugNestFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, BedBugSurfaceClusterFeature> BED_BUG_SURFACE_CLUSTER = FEATURES.register("bed_bug_surface_cluster", () -> new BedBugSurfaceClusterFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynEggPatchFeature> CAVARYN_TERROR_EGG_PATCH = FEATURES.register("cavaryn_terror_egg_patch", - () -> new CavarynEggPatchFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, ThoraxisAntiwaterPoolFeature> THORAXIS_ANTIWATER_POOL = FEATURES.register("thoraxis_antiwater_pool", () -> new ThoraxisAntiwaterPoolFeature(ThoraxisAntiwaterPoolConfiguration.CODEC)); public static final DeferredHolder, LucidAntiwaterPoolFeature> LUCID_ANTIWATER_POOL = FEATURES.register("lucid_antiwater_pool", @@ -1210,13 +1095,8 @@ public final class AntarchyFabricContent { public static final DeferredItem OURANWOOD_LEAVES_ITEM = ITEMS.registerSimpleBlockItem(OURANWOOD_LEAVES); public static final DeferredItem OURANWOOD_ACORN = ITEMS.registerSimpleBlockItem(OURANWOOD_ACORN_BLOCK); // public static final DeferredItem OURANWOOD_VINE_ITEM = ITEMS.registerSimpleBlockItem(OURANWOOD_VINE); - public static final DeferredItem VERY_SHORT_GRASS_ITEM = ITEMS.registerSimpleBlockItem(VERY_SHORT_GRASS); - public static final DeferredItem VERY_TALL_GRASS_ITEM = ITEMS.registerSimpleBlockItem(VERY_TALL_GRASS); - public static final DeferredItem BIG_BUSH_ITEM = ITEMS.register("big_bush", - () -> new com.craisinlord.antarchy.content.item.BigBushBlockItem(BIG_BUSH.get(), new Item.Properties())); public static final DeferredItem ORANGE_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(ORANGE_MILKWEED); public static final DeferredItem PINK_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(PINK_MILKWEED); - public static final DeferredItem TORCHFLOWER_BUSH_ITEM = ITEMS.registerSimpleBlockItem(TORCHFLOWER_BUSH); public static final DeferredItem OURANWOOD_SIGN_ITEM = ITEMS.register("ouranwood_sign", () -> new net.minecraft.world.item.SignItem(new Item.Properties().stacksTo(16), OURANWOOD_SIGN.get(), OURANWOOD_WALL_SIGN.get())); public static final DeferredItem OURANWOOD_HANGING_SIGN_ITEM = ITEMS.register("ouranwood_hanging_sign", @@ -1229,7 +1109,6 @@ public final class AntarchyFabricContent { public static final DeferredItem RED_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(RED_ANT_NEST); public static final DeferredItem BROWN_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(BROWN_ANT_NEST); public static final DeferredItem RAINBOW_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(RAINBOW_ANT_NEST); - public static final DeferredItem TERMITE_NEST_ITEM = ITEMS.registerSimpleBlockItem(TERMITE_NEST); public static final DeferredItem URANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(URANIUM_ORE); public static final DeferredItem DEEPSLATE_URANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(DEEPSLATE_URANIUM_ORE); public static final DeferredItem TITANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(TITANIUM_ORE); @@ -1285,12 +1164,9 @@ public final class AntarchyFabricContent { public static final DeferredItem INFESTED_ROOTED_DIRT_ITEM = ITEMS.registerSimpleBlockItem(INFESTED_ROOTED_DIRT); public static final DeferredItem INFESTED_COARSE_DIRT_ITEM = ITEMS.registerSimpleBlockItem(INFESTED_COARSE_DIRT); public static final DeferredItem NYXITE_ITEM = ITEMS.registerSimpleBlockItem(NYXITE); - public static final DeferredItem MYRMITE_ITEM = ITEMS.registerSimpleBlockItem(MYRMITE); - public static final DeferredItem BROODSTONE_ITEM = ITEMS.registerSimpleBlockItem(BROODSTONE); public static final DeferredItem POLISHED_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(POLISHED_NYXITE); public static final DeferredItem CHISELED_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(CHISELED_NYXITE); public static final DeferredItem NYXITE_BRICKS_ITEM = ITEMS.registerSimpleBlockItem(NYXITE_BRICKS); - public static final DeferredItem CHITEN_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(CHITEN_BLOCK); public static final DeferredItem NYXITE_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(NYXITE_STAIRS); public static final DeferredItem NYXITE_SLAB_ITEM = ITEMS.registerSimpleBlockItem(NYXITE_SLAB); public static final DeferredItem NYXITE_WALL_ITEM = ITEMS.registerSimpleBlockItem(NYXITE_WALL); @@ -1325,17 +1201,10 @@ public final class AntarchyFabricContent { public static final DeferredItem POTENT_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(POTENT_NYXITE); public static final DeferredItem UMBRAL_MOSS_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(UMBRAL_MOSS_BLOCK); public static final DeferredItem UMBRAL_MOSS_CARPET_ITEM = ITEMS.registerSimpleBlockItem(UMBRAL_MOSS_CARPET); - public static final DeferredItem AMBER_MOSS_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(AMBER_MOSS_BLOCK); - public static final DeferredItem AMBER_MOSS_CARPET_ITEM = ITEMS.registerSimpleBlockItem(AMBER_MOSS_CARPET); - public static final DeferredItem AMBER_LICHEN_ITEM = ITEMS.registerSimpleBlockItem(AMBER_LICHEN); - public static final DeferredItem BILE_VEIN_ITEM = ITEMS.registerSimpleBlockItem(BILE_VEIN); - public static final DeferredItem CREEPVINE_ITEM = ITEMS.registerSimpleBlockItem(CREEPVINE); public static final DeferredItem DREAM_TORCH_ITEM = ITEMS.register("dream_torch", () -> new StandingAndWallBlockItem(DREAM_TORCH.get(), DREAM_WALL_TORCH.get(), new Item.Properties(), Direction.UP)); public static final DeferredItem DREAM_LANTERN_ITEM = ITEMS.registerSimpleBlockItem(DREAM_LANTERN); public static final DeferredItem DREAM_CAMPFIRE_ITEM = ITEMS.registerSimpleBlockItem(DREAM_CAMPFIRE); - public static final DeferredItem CREEPING_HORROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(CREEPING_HORROR_EGG); - public static final DeferredItem LURKING_TERROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(LURKING_TERROR_EGG); public static final DeferredItem BED_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(BED_BUG_EGG); public static final DeferredItem WASP_NEST_ITEM = ITEMS.registerSimpleBlockItem(WASP_NEST); public static final DeferredItem HUSHWEED_ITEM = ITEMS.registerSimpleBlockItem(HUSHWEED); @@ -1378,10 +1247,10 @@ public final class AntarchyFabricContent { () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE))); public static final DeferredItem QUEEN_SCALE = ITEMS.register("queen_scale", () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE))); - public static final DeferredItem CHITEN = ITEMS.registerSimpleItem("chiten", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem CHITEN_SPIKE_ITEM = ITEMS.registerSimpleBlockItem(CHITEN_SPIKE); - public static final DeferredItem STINK_BUG_ITEM = ITEMS.registerSimpleItem("stink_bug", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem JUMPY_BUG_LEG = ITEMS.registerSimpleItem("jumpy_bug_leg", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final DeferredItem STINK_BUG_ITEM = ITEMS.register("stink_bug", + () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.UNCOMMON))); + public static final DeferredItem JUMPY_BUG_LEG = ITEMS.register("jumpy_bug_leg", + () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.UNCOMMON))); private static final DeferredHolder JUMPY_BOOTS_ARMOR_MATERIAL = ARMOR_MATERIALS.register("jumpy_boots", () -> new ArmorMaterial( createJumpyBootsDefense(), @@ -1695,6 +1564,15 @@ public final class AntarchyFabricContent { .sized(11.4F, 39.0F) .clientTrackingRange(12) .build("kraken")); + public static final DeferredHolder, EntityType> KRAKEN_PART = ENTITY_TYPES.register("kraken_part", + () -> EntityType.Builder.of( + com.craisinlord.antarchy.fabric.entity.multipart.MultipartPartEntity::new, + MobCategory.MISC + ) + .sized(1.0F, 1.0F) + .clientTrackingRange(12) + .updateInterval(1) + .build("kraken_part")); public static final DeferredHolder, EntityType> MISSILE_SQUID = ENTITY_TYPES.register("missile_squid", () -> EntityType.Builder.of(MissileSquidEntity::new, MobCategory.MONSTER) .sized(1.62F, 3.18F) @@ -1780,16 +1658,12 @@ public final class AntarchyFabricContent { () -> new DeferredSpawnEggItem(BROWN_ANT, 0x6A4320, 0x26160A, new Item.Properties())); public static final DeferredItem RAINBOW_ANT_SPAWN_EGG = ITEMS.register("rainbow_ant_spawn_egg", () -> new DeferredSpawnEggItem(RAINBOW_ANT, 0x56D4F0, 0xF66DBB, new Item.Properties())); - public static final DeferredItem TERMITE_SPAWN_EGG = ITEMS.register("termite_spawn_egg", - () -> new DeferredSpawnEggItem(TERMITE, 0xD4B96A, 0xFF6B1A, new Item.Properties())); public static final DeferredItem MOLEWORM_SPAWN_EGG = ITEMS.register("moleworm_spawn_egg", () -> new DeferredSpawnEggItem(MOLEWORM, 0xB8B8B8, 0x8A623A, new Item.Properties())); public static final DeferredItem MANTIS_SPAWN_EGG = ITEMS.register("mantis_spawn_egg", () -> new DeferredSpawnEggItem(MANTIS, 0xF8F8F2, 0x63B44A, new Item.Properties())); public static final DeferredItem ALPHA_MANTIS_SPAWN_EGG = ITEMS.register("alpha_mantis_spawn_egg", () -> new DeferredSpawnEggItem(ALPHA_MANTIS, 0x8FDD6C, 0x2F5D22, new Item.Properties())); - public static final DeferredItem ROLLY_POLLY_SPAWN_EGG = ITEMS.register("rolly_polly_spawn_egg", - () -> new DeferredSpawnEggItem(ROLLY_POLLY, 0x7284A3, 0xBCC8DB, new Item.Properties())); public static final DeferredItem MOLEVORE_SPAWN_EGG = ITEMS.register("molevore_spawn_egg", () -> new DeferredSpawnEggItem(MOLEVORE, 0x4A4A4A, 0x6B4A2B, new Item.Properties().rarity(Rarity.UNCOMMON))); public static final DeferredItem TRIFFID_SPAWN_EGG = ITEMS.register("triffid_spawn_egg", @@ -1806,12 +1680,6 @@ public final class AntarchyFabricContent { () -> new DeferredSpawnEggItem(WASP, 0x111111, 0xF1D800, new Item.Properties())); public static final DeferredItem BOMBER_SPAWN_EGG = ITEMS.register("bomber_spawn_egg", () -> new DeferredSpawnEggItem(BOMBER, 0x7A7A7A, 0xB32020, new Item.Properties())); - public static final DeferredItem JUMPY_BUG_SPAWN_EGG = ITEMS.register("jumpy_bug_spawn_egg", - () -> new DeferredSpawnEggItem(JUMPY_BUG, 0x0A1636, 0x8A3E00, new Item.Properties())); - public static final DeferredItem SPIT_BUG_SPAWN_EGG = ITEMS.register("spit_bug_spawn_egg", - () -> new DeferredSpawnEggItem(SPIT_BUG, 0x6B4A2B, 0x7ED957, new Item.Properties())); - public static final DeferredItem STINK_BUG_SPAWN_EGG = ITEMS.register("stink_bug_spawn_egg", - () -> new DeferredSpawnEggItem(STINK_BUG, 0x111111, 0xFF7A00, new Item.Properties())); public static final DeferredItem CLOUD_SHARK_SPAWN_EGG = ITEMS.register("cloud_shark_spawn_egg", () -> new DeferredSpawnEggItem(CLOUD_SHARK, 0xDDEAF4, 0x7F96A8, new Item.Properties())); public static final DeferredItem KRAKEN_SPAWN_EGG = ITEMS.register("kraken_spawn_egg", @@ -1864,44 +1732,24 @@ public final class AntarchyFabricContent { .clientTrackingRange(8) .updateInterval(1) .build("water_bomb")); - public static final DeferredHolder, EntityType> CREEPING_HORROR = ENTITY_TYPES.register("creeping_horror", - () -> EntityType.Builder.of(CreepingHorrorEntity::new, MobCategory.MONSTER) - .sized(1.3F, 1.5F) - .clientTrackingRange(10) - .build("creeping_horror")); - public static final DeferredHolder, EntityType> LURKING_TERROR = ENTITY_TYPES.register("lurking_terror", - () -> EntityType.Builder.of(LurkingTerrorEntity::new, MobCategory.MONSTER) - .sized(1.3F, 1.5F) - .clientTrackingRange(10) - .build("lurking_terror")); public static final DeferredItem TORETERROR_SPAWN_EGG = ITEMS.register("toreterror_spawn_egg", () -> new DeferredSpawnEggItem(TORETERROR, 0x90EE90, 0x5C4033, new Item.Properties().rarity(Rarity.EPIC))); - public static final DeferredItem CREEPING_HORROR_SPAWN_EGG = ITEMS.register("creeping_horror_spawn_egg", - () -> new DeferredSpawnEggItem(CREEPING_HORROR, 0x6B3A1F, 0x6B0000, new Item.Properties())); - public static final DeferredItem LURKING_TERROR_SPAWN_EGG = ITEMS.register("lurking_terror_spawn_egg", - () -> new DeferredSpawnEggItem(LURKING_TERROR, 0x2D5A1B, 0x8B0000, new Item.Properties())); public static final DeferredHolder, EntityType> CHEEP = ENTITY_TYPES.register("cheep", () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.CheepEntity::new, MobCategory.WATER_AMBIENT) .sized(1.0F, 1.2F) .clientTrackingRange(8) .build("cheep")); - public static final DeferredHolder, EntityType> DORRIE = ENTITY_TYPES.register("dorrie", - () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.DorrieEntity::new, MobCategory.WATER_CREATURE) - .sized(2.4F, 2.0F) - .clientTrackingRange(10) - .build("dorrie")); - public static final DeferredHolder, EntityType> HERCULES_BEETLE = ENTITY_TYPES.register("hercules_beetle", - () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.HerculesBeetleEntity::new, MobCategory.MONSTER) - .sized(3.0F, 4.0F) - .clientTrackingRange(12) - .build("hercules_beetle")); public static final DeferredItem CHEEP_SPAWN_EGG = ITEMS.register("cheep_spawn_egg", () -> new DeferredSpawnEggItem(CHEEP, 0xFF00AA, 0x00FF44, new Item.Properties())); - public static final DeferredItem DORRIE_SPAWN_EGG = ITEMS.register("dorrie_spawn_egg", - () -> new DeferredSpawnEggItem(DORRIE, 0x1B91B3, 0xC0E8FF, new Item.Properties())); - public static final DeferredItem HERCULES_BEETLE_SPAWN_EGG = ITEMS.register("hercules_beetle_spawn_egg", - () -> new DeferredSpawnEggItem(HERCULES_BEETLE, 0x6B1F2A, 0xD4AF37, new Item.Properties().rarity(Rarity.RARE))); + + // public static final DeferredHolder, EntityType> GLIMMER = ENTITY_TYPES.register("glimmer", + // () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.GlimmerEntity::new, MobCategory.CREATURE) + // .sized(0.9F, 1.4F) + // .clientTrackingRange(8) + // .build("glimmer")); + // public static final DeferredItem GLIMMER_SPAWN_EGG = ITEMS.register("glimmer_spawn_egg", + // () -> new DeferredSpawnEggItem(GLIMMER, 0xBEEFFF, 0x6FD8FF, new Item.Properties())); public static final DeferredHolder ANTARCHY_TAB = CREATIVE_MODE_TABS.register("antarchy", () -> CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0) @@ -1975,25 +1823,18 @@ public final class AntarchyFabricContent { FabricDefaultAttributeRegistry.register(OCTOPUS_BOMB.get(), OctopusBombEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(NIGHTMARE.get(), NightmareEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(BED_BUG.get(), BedBugEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(STINK_BUG.get(), StinkBugEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(WASP.get(), WaspEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(BOMBER.get(), BomberEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(JUMPY_BUG.get(), JumpyBugEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(SPIT_BUG.get(), SpitBugEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(MANTIS.get(), MantisEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(ALPHA_MANTIS.get(), AlphaMantisEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(ROLLY_POLLY.get(), RollyPollyEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(TRIFFID.get(), TriffidEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(LUCID.get(), LucidEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(SCORPION.get(), ScorpionEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(BASILISK.get(), BasiliskEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(EMPEROR_SCORPION.get(), EmperorScorpionEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(TORETERROR.get(), ToreterrorEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(CREEPING_HORROR.get(), CreepingHorrorEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(LURKING_TERROR.get(), LurkingTerrorEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(CHEEP.get(), com.craisinlord.antarchy.content.entity.CheepEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(DORRIE.get(), com.craisinlord.antarchy.content.entity.DorrieEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(HERCULES_BEETLE.get(), com.craisinlord.antarchy.content.entity.HerculesBeetleEntity.createAttributes().build()); + // FabricDefaultAttributeRegistry.register(GLIMMER.get(), com.craisinlord.antarchy.content.entity.GlimmerEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(RED_ANT.get(), buildAntAttributes( AntarchySettings.redAntHealth(), @@ -2012,11 +1853,6 @@ public final class AntarchyFabricContent { ).build()); FabricDefaultAttributeRegistry.register(MOLEWORM.get(), MolewormEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(MOLEVORE.get(), MolevoreEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(TERMITE.get(), buildAntAttributes( - AntarchySettings.termiteHealth(), - AntarchySettings.termiteMovementSpeed(), - AntarchySettings.termiteAttackDamage() - ).build()); } private static void registerSpawnPlacements() { @@ -2031,27 +1867,22 @@ public final class AntarchyFabricContent { SpawnPlacements.register(CLOUD_SHARK.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CloudSharkEntity::canSpawn); SpawnPlacements.register(WASP.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, WaspEntity::canSpawn); SpawnPlacements.register(BOMBER.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BomberEntity::canSpawn); - SpawnPlacements.register(JUMPY_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, JumpyBugEntity::canSpawn); - SpawnPlacements.register(SPIT_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, SpitBugEntity::canSpawn); SpawnPlacements.register(KRAKEN.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, KrakenEntity::canSpawn); SpawnPlacements.register(MISSILE_SQUID.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MissileSquidEntity::canSpawn); SpawnPlacements.register(OCTOPUS_BOMB.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, OctopusBombEntity::canSpawn); SpawnPlacements.register(CHEEP.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.AbstractFish::checkSurfaceWaterAnimalSpawnRules); + // SpawnPlacements.register(GLIMMER.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.Animal::checkAnimalSpawnRules); SpawnPlacements.register(NIGHTMARE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, NightmareEntity::canSpawn); SpawnPlacements.register(MOLEWORM.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MolewormEntity::canSpawn); SpawnPlacements.register(MANTIS.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MantisEntity::canSpawn); SpawnPlacements.register(ALPHA_MANTIS.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, AlphaMantisEntity::checkAlphaMantisSpawnRules); SpawnPlacements.register(MOLEVORE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MolevoreEntity::canSpawn); SpawnPlacements.register(BED_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BedBugEntity::canSpawn); - SpawnPlacements.register(STINK_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, StinkBugEntity::canSpawn); SpawnPlacements.register(LUCID.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, LucidEntity::canSpawn); SpawnPlacements.register(SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, ScorpionEntity::canSpawn); SpawnPlacements.register(BASILISK.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BasiliskEntity::canSpawn); SpawnPlacements.register(EMPEROR_SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EmperorScorpionEntity::canSpawn); SpawnPlacements.register(TORETERROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, ToreterrorEntity::canSpawn); - SpawnPlacements.register(CREEPING_HORROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CreepingHorrorEntity::canSpawn); - SpawnPlacements.register(LURKING_TERROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, LurkingTerrorEntity::canSpawn); - SpawnPlacements.register(TERMITE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.Animal::checkAnimalSpawnRules); } private static void populateCreativeTab(CreativeModeTab.Output output) { @@ -2123,7 +1954,7 @@ public final class AntarchyFabricContent { "smooth_dream_sandstone_stairs", "smooth_dream_sandstone_slab", "cut_dream_sandstone_slab" -> 4; case "umbral_moss_block", "umbral_moss_carpet" -> 4; - case "torchflower_bush", "big_bush", "very_short_grass", "very_tall_grass", "hushweed", "orange_milkweed", "pink_milkweed", "amber_lichen", "creepvine" -> 6; + case "hushweed", "orange_milkweed", "pink_milkweed", "amber_lichen", "creepvine" -> 6; case "blood_crystal_block", "budding_blood_crystal", "small_blood_crystal_bud", "medium_blood_crystal_bud", "large_blood_crystal_bud", "blood_crystal_cluster" -> 7; @@ -2135,7 +1966,6 @@ public final class AntarchyFabricContent { "chiseled_titanium", "uranium_bulb", "titanium_bulb", "uranium_door", "titanium_door", "uranium_trapdoor", "titanium_trapdoor", "uranium_bars", "titanium_bars" -> 8; - case "bile_vein" -> 9; case "infested_rooted_dirt", "infested_coarse_dirt", "triffid_goo_block", "cloud_block", "creeping_horror_egg", "lurking_terror_egg" -> 9; case "dream_torch", "dream_lantern", "dream_campfire", "dream_fire", "dream_fire_ceiling" -> 10; @@ -2145,7 +1975,7 @@ public final class AntarchyFabricContent { "moleworm_spawn_egg", "mantis_spawn_egg", "alpha_mantis_spawn_egg", "rolly_polly_spawn_egg", "molevore_spawn_egg", "triffid_spawn_egg", "apple_cow_spawn_egg", "golden_apple_cow_spawn_egg", "enchanted_golden_apple_cow_spawn_egg", "honeyed_apple_cow_spawn_egg", "dr_trayaurus_spawn_egg", "wasp_spawn_egg", - "bomber_spawn_egg", "jumpy_bug_spawn_egg", "spit_bug_spawn_egg", "stink_bug_spawn_egg", "cloud_shark_spawn_egg", "kraken_spawn_egg", "missile_squid_spawn_egg", "octopus_bomb_spawn_egg", + "bomber_spawn_egg", "jumpy_bug_spawn_egg", "stink_bug_spawn_egg", "cloud_shark_spawn_egg", "kraken_spawn_egg", "missile_squid_spawn_egg", "octopus_bomb_spawn_egg", "nightmare_spawn_egg", "bed_bug_spawn_egg", "lucid_spawn_egg", "scorpion_spawn_egg", "basilisk_spawn_egg", "emperor_scorpion_spawn_egg", "toreterror_spawn_egg", "hercules_beetle_spawn_egg", @@ -2454,14 +2284,13 @@ public final class AntarchyFabricContent { CREATIVE_MODE_TABS.register(); // Wire common-module accessors after all registrations are complete. - AntarchyObjects.setHerculesBeetle(() -> HERCULES_BEETLE.get()); PermanentPortalType.bindBlocks( () -> MOSSY_OURANWOOD_WOOD.get(), () -> ELYTHIA_PORTAL.get(), () -> NYXITE.get(), () -> THORAXIS_PORTAL.get(), - () -> MYRMITE.get(), - () -> CAVARYN_PORTAL.get() + () -> NYXITE.get(), + () -> THORAXIS_PORTAL.get() ); AntarchySoundEvents.bind( @@ -2588,17 +2417,19 @@ public final class AntarchyFabricContent { TORETERROR_JUMP_UP, TORETERROR_JUMP_LAND, STINKY_FLY_SOUND, - CREEPING_HORROR_GROWL, - CREEPING_HORROR_HURT, - CREEPING_HORROR_BITE, - LURKING_TERROR_SNARL, - LURKING_TERROR_HURT, - LURKING_TERROR_BITE, - LURKING_TERROR_FLY_LOOP, + ANT_IDLE, + ANT_HURT, + ANT_BITE, + ANT_IDLE, + ANT_HURT, + ANT_BITE, + ANT_IDLE, DUCT_TAPE_USE ); AntarchyObjects.setOctopusBomb(OCTOPUS_BOMB); + // AntarchyObjects.setGlimmer(GLIMMER); + // AntarchyObjects.setGlimmersGrace(() -> mobEffectHolder(GLIMMERS_GRACE)); AntarchyObjects.bind( EASTER_BUNNY, FLYING_SQUIRREL, @@ -2619,11 +2450,11 @@ public final class AntarchyFabricContent { HUSH_PROJECTILE, TORETERROR, WATER_BOMB, - CREEPING_HORROR, - LURKING_TERROR, - STINK_BUG, + (java.util.function.Supplier) BOMBER, + (java.util.function.Supplier) BOMBER, + (java.util.function.Supplier) BED_BUG, CHEEP, - DORRIE, + (java.util.function.Supplier) CHEEP, () -> DUPLICATOR_LOG.get(), () -> DUPLICATOR_SAPLING.get(), () -> DUCT_TAPE.get(), @@ -2652,8 +2483,8 @@ public final class AntarchyFabricContent { () -> TRIFFID_GOO_BLOCK.get(), () -> PALE_NYXITE.get(), () -> NYXITE_SPIKE.get(), - () -> CHITEN_BLOCK.get(), - () -> CHITEN_SPIKE.get(), + () -> NYXITE.get(), + () -> NYXITE_SPIKE.get(), () -> POTENT_NYXITE.get(), () -> ANTIMETAL.get(), () -> POLISHED_ANTIMETAL.get(), @@ -2676,10 +2507,9 @@ public final class AntarchyFabricContent { () -> MOSSY_OURANWOOD_WOOD.get(), () -> ORANGE_MILKWEED.get(), () -> PINK_MILKWEED.get(), - () -> TORCHFLOWER_BUSH.get(), () -> BED_BUG_EGG.get(), - () -> CREEPING_HORROR_EGG.get(), - () -> LURKING_TERROR_EGG.get(), + () -> BED_BUG_EGG.get(), + () -> BED_BUG_EGG.get(), () -> WASP_NEST.get(), () -> HUSHWEED.get(), () -> OURANWOOD_SQUIRREL_NEST.get(), diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java index 765ce68f..972fcf8b 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java @@ -52,13 +52,7 @@ public final class AntarchyFabricEvents { ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.UMBRAL_MOSS_BLOCK.get().asItem(), 0.65f); ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.UMBRAL_MOSS_CARPET.get().asItem(), 0.3f); - ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.AMBER_MOSS_BLOCK.get().asItem(), 0.65f); - ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.AMBER_MOSS_CARPET.get().asItem(), 0.3f); - ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.BIG_BUSH.get().asItem(), 0.65f); - ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.CREEPVINE.get().asItem(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.HUSHWEED.get().asItem(), 0.65f); - ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.VERY_SHORT_GRASS.get().asItem(), 0.3f); - ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.VERY_TALL_GRASS.get().asItem(), 0.5f); ComposterBlock.COMPOSTABLES.put(AntarchyFabricContent.CORNEA_EAR.get(), 0.65f); ServerLivingEntityEvents.AFTER_DEATH.register((entity, damageSource) -> { diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClient.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClient.java index d4ad79a8..4570a6e8 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClient.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClient.java @@ -7,6 +7,7 @@ public final class AntarchyFabricClient implements ClientModInitializer { @Override public void onInitializeClient() { AntarchyFabricClientNetworking.register(); + AntarchyFabricClientNetworking.bootstrapMultipartClient(); AntarchyFabricClientBootstrap.register(); } } diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java index fbe05412..7c61431e 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java @@ -6,6 +6,7 @@ import com.craisinlord.antarchy.content.client.renderer.*; import com.craisinlord.antarchy.content.client.particle.*; import com.craisinlord.antarchy.content.client.renderer.AntiwaterFluidRenderer; import com.craisinlord.antarchy.fabric.AntarchyFabricContent; +import com.craisinlord.antarchy.fabric.client.renderer.MultipartPartRenderer; import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback; import net.minecraft.world.entity.EntityType; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; @@ -75,11 +76,9 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricContent.RED_ANT.get(), AntRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.BROWN_ANT.get(), AntRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.RAINBOW_ANT.get(), AntRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.TERMITE.get(), TermiteRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.MOLEWORM.get(), MolewormRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.MANTIS.get(), MantisRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.ALPHA_MANTIS.get(), AlphaMantisRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.ROLLY_POLLY.get(), RollyPollyRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.MOLEVORE.get(), MolevoreRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.TRIFFID.get(), TriffidRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.OURANWOOD_BOAT_ENTITY.get(), context -> new OuranwoodBoatRenderer<>(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/boat/ouranwood.png"), false)); @@ -91,16 +90,14 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricContent.DR_TRAYAURUS.get(), context -> new DrTrayaurusRenderer(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/dr_trayaurus.png"))); EntityRendererRegistry.register(AntarchyFabricContent.CLOUD_SHARK.get(), CloudSharkRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.KRAKEN.get(), KrakenRenderer::new); + EntityRendererRegistry.register(AntarchyFabricContent.KRAKEN_PART.get(), MultipartPartRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.MISSILE_SQUID.get(), MissileSquidRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.OCTOPUS_BOMB.get(), OctopusBombRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.NIGHTMARE.get(), NightmareRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.LUCID.get(), LucidRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.BED_BUG.get(), BedBugRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.STINK_BUG.get(), StinkBugRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.WASP.get(), WaspRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.BOMBER.get(), BomberRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.JUMPY_BUG.get(), JumpyBugRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.SPIT_BUG.get(), SpitBugRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.BASILISK.get(), BasiliskRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.SHRINK_RAY_PROJECTILE.get(), SizeRayProjectileRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.GROWTH_RAY_PROJECTILE.get(), SizeRayProjectileRenderer::new); @@ -108,17 +105,13 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricContent.LUCID_PEARL_PROJECTILE.get(), ThrownItemRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.HUSH_PROJECTILE.get(), HushProjectileRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.BRUTALFLY_ORB.get(), BrutalflyOrbRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.SPIT_BUG_PROJECTILE.get(), SpitBugProjectileRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.UPWARD_FALLING_BLOCK.get(), UpwardFallingBlockRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.SCORPION.get(), ScorpionRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.EMPEROR_SCORPION.get(), EmperorScorpionRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.TORETERROR.get(), ToreterrorRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.WATER_BOMB.get(), WaterBombRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.CREEPING_HORROR.get(), CreepingHorrorRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.LURKING_TERROR.get(), LurkingTerrorRenderer::new); EntityRendererRegistry.register(AntarchyFabricContent.CHEEP.get(), com.craisinlord.antarchy.content.client.renderer.CheepRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.DORRIE.get(), com.craisinlord.antarchy.content.client.renderer.DorrieRenderer::new); - EntityRendererRegistry.register(AntarchyFabricContent.HERCULES_BEETLE.get(), com.craisinlord.antarchy.content.client.renderer.HerculesBeetleRenderer::new); + // EntityRendererRegistry.register(AntarchyFabricContent.GLIMMER.get(), com.craisinlord.antarchy.content.client.renderer.GlimmerRenderer::new); EntityModelLayerRegistry.registerModelLayer(OuranwoodBoatRenderer.boatLayer(), BoatModel::createBodyModel); EntityModelLayerRegistry.registerModelLayer(OuranwoodBoatRenderer.chestBoatLayer(), ChestBoatModel::createBodyModel); @@ -135,18 +128,11 @@ public final class AntarchyFabricClientBootstrap { ColorProviderRegistry.BLOCK.register( (state, level, pos, tintIndex) -> level != null && pos != null ? BiomeColors.getAverageGrassColor(level, pos) - : net.minecraft.world.level.GrassColor.getDefaultColor(), - AntarchyFabricContent.BIG_BUSH.get(), - AntarchyFabricContent.BIG_BUSH_PART.get(), - AntarchyFabricContent.VERY_SHORT_GRASS.get(), - AntarchyFabricContent.VERY_TALL_GRASS.get() + : net.minecraft.world.level.GrassColor.getDefaultColor() ); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> FoliageColor.getDefaultColor(), AntarchyFabricContent.OURANWOOD_LEAVES_ITEM.get()); ColorProviderRegistry.ITEM.register( - (stack, tintIndex) -> net.minecraft.world.level.GrassColor.getDefaultColor(), - AntarchyFabricContent.BIG_BUSH_ITEM.get(), - AntarchyFabricContent.VERY_SHORT_GRASS_ITEM.get(), - AntarchyFabricContent.VERY_TALL_GRASS_ITEM.get() + (stack, tintIndex) -> net.minecraft.world.level.GrassColor.getDefaultColor() ); } @@ -228,22 +214,12 @@ public final class AntarchyFabricClientBootstrap { BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.DUPLICATOR_SAPLING.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.ORANGE_MILKWEED.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.PINK_MILKWEED.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.TORCHFLOWER_BUSH.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.BIG_BUSH.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.BIG_BUSH_PART.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.VERY_SHORT_GRASS.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.VERY_TALL_GRASS.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.HUSHWEED.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.CORNEA_STALK.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.FALLEN_KING_CROWN_BLOCK.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.ANTIMETAL_SCAFFOLDING.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.UMBRAL_MOSS_CARPET.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.AMBER_MOSS_CARPET.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.AMBER_LICHEN.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.BILE_VEIN.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.CREEPVINE.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.NYXITE_SPIKE.get(), RenderType.cutout()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.CHITEN_SPIKE.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.SMALL_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.MEDIUM_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.LARGE_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); @@ -257,7 +233,6 @@ public final class AntarchyFabricClientBootstrap { BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.ANTIWATER_BLOCK.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.ELYTHIA_PORTAL.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.THORAXIS_PORTAL.get(), RenderType.translucent()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.CAVARYN_PORTAL.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.TRIFFID_GOO_BLOCK.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.URANIUM_DOOR.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.TITANIUM_DOOR.get(), RenderType.cutout()); @@ -369,8 +344,6 @@ public final class AntarchyFabricClientBootstrap { MogglesClientRenderer.register(); StinkySoundHandler.register(); ReverieTrailHandler.register(); - ClientTickEvents.END_CLIENT_TICK.register(com.craisinlord.antarchy.content.client.BigBushCameraHider::update); - HudRenderCallback.EVENT.register((guiGraphics, partialTick) -> { DreadHudRenderer.render(guiGraphics); ParalyzedHudRenderer.render(guiGraphics); diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/multipart/MultipartClientPartLevelRegistry.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/multipart/MultipartClientPartLevelRegistry.java new file mode 100644 index 00000000..3d4d0be6 --- /dev/null +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/multipart/MultipartClientPartLevelRegistry.java @@ -0,0 +1,37 @@ +package com.craisinlord.antarchy.fabric.client.multipart; + +import com.craisinlord.antarchy.content.entity.multipart.MultipartEntityOwner; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.world.entity.Entity; + +public final class MultipartClientPartLevelRegistry { + private MultipartClientPartLevelRegistry() { + } + + public static void register(MultipartEntityOwner owner) { + Entity[] parts = owner.antarchy$getMultipartParts(); + if (parts == null) { + return; + } + + ClientLevel clientLevel = (ClientLevel) ((Entity) owner).level(); + for (Entity part : parts) { + if (part != null && clientLevel.getEntity(part.getId()) != part) { + clientLevel.addEntity(part); + } + } + } + + public static void unregister(MultipartEntityOwner owner) { + Entity[] parts = owner.antarchy$getMultipartParts(); + if (parts == null) { + return; + } + + for (Entity part : parts) { + if (part != null && !part.isRemoved()) { + part.discard(); + } + } + } +} diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/renderer/MultipartPartRenderer.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/renderer/MultipartPartRenderer.java new file mode 100644 index 00000000..9ac04fbc --- /dev/null +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/client/renderer/MultipartPartRenderer.java @@ -0,0 +1,26 @@ +package com.craisinlord.antarchy.fabric.client.renderer; + +import com.craisinlord.antarchy.fabric.entity.multipart.MultipartPartEntity; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.resources.ResourceLocation; + +public class MultipartPartRenderer extends EntityRenderer { + private static final ResourceLocation TEXTURE = ResourceLocation.withDefaultNamespace("textures/misc/white.png"); + + public MultipartPartRenderer(EntityRendererProvider.Context context) { + super(context); + this.shadowRadius = 0.0F; + } + + @Override + public void render(MultipartPartEntity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource buffer, int packedLight) { + } + + @Override + public ResourceLocation getTextureLocation(MultipartPartEntity entity) { + return TEXTURE; + } +} diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/FabricKrakenMultipartLayout.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/FabricKrakenMultipartLayout.java new file mode 100644 index 00000000..de51b887 --- /dev/null +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/FabricKrakenMultipartLayout.java @@ -0,0 +1,65 @@ +package com.craisinlord.antarchy.fabric.entity.multipart; + +import com.craisinlord.antarchy.content.entity.multipart.MultipartPartDefinition; + +public final class FabricKrakenMultipartLayout { + private static final MultipartPartDefinition[] PARTS = { + new MultipartPartDefinition( + "tentacle_mass", + 14.0F, + 18.0F, + 0.90F, + 12.0D, + 13.5D, + 0.00D, + true + ), + new MultipartPartDefinition( + "head", + 15.0F, + 11.5F, + 1.00F, + 26.0D, + 19.0D, + 0.00D, + true + ), + new MultipartPartDefinition( + "back_head", + 13.0F, + 11.0F, + 1.10F, + 38.0D, + 20.5D, + 0.00D, + true + ), + new MultipartPartDefinition( + "mantle", + 16.0F, + 14.0F, + 1.00F, + 51.0D, + 23.0D, + 0.00D, + true + ), + new MultipartPartDefinition( + "crest", + 12.0F, + 10.0F, + 1.10F, + 63.0D, + 28.0D, + 0.00D, + true + ) + }; + + private FabricKrakenMultipartLayout() { + } + + public static MultipartPartDefinition part(int partIndex) { + return PARTS[partIndex]; + } +} diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/MultipartPartEntity.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/MultipartPartEntity.java new file mode 100644 index 00000000..2402dfd8 --- /dev/null +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/MultipartPartEntity.java @@ -0,0 +1,199 @@ +package com.craisinlord.antarchy.fabric.entity.multipart; + +import com.craisinlord.antarchy.content.entity.multipart.MultipartEntityOwner; +import com.craisinlord.antarchy.content.entity.multipart.MultipartFramework; +import com.craisinlord.antarchy.content.entity.multipart.MultipartPartAccess; +import com.craisinlord.antarchy.content.entity.multipart.MultipartPartDefinition; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityDimensions; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.Pose; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.Nullable; + +public class MultipartPartEntity extends Entity implements MultipartPartAccess { + @Nullable + private MultipartEntityOwner owner; + private int partIndex; + @Nullable + private MultipartPartDefinition definition; + + public MultipartPartEntity(EntityType entityType, Level level) { + super(entityType, level); + this.setNoGravity(true); + } + + public MultipartPartEntity antarchy$configure(MultipartEntityOwner owner, int partIndex, MultipartPartDefinition definition) { + this.owner = owner; + this.partIndex = partIndex; + this.definition = definition; + this.refreshDimensions(); + this.antarchy$syncFromParent(); + return this; + } + + @Nullable + public Entity antarchy$getMultipartParent() { + return this.owner == null ? null : (Entity) this.owner; + } + + public int getPartIndex() { + return this.partIndex; + } + + public String getPartName() { + return this.definition == null ? "" : this.definition.name(); + } + + public float getDamageMultiplier() { + return this.definition == null ? 1.0F : this.definition.damageMultiplier(); + } + + @Override + public void antarchy$syncFromParent() { + Entity parent = this.antarchy$getMultipartParent(); + MultipartPartDefinition definition = this.definition; + if (parent == null || definition == null || parent.isRemoved()) { + return; + } + + double oldX = this.getX(); + double oldY = this.getY(); + double oldZ = this.getZ(); + double yawRadians = Math.toRadians(parent.getYRot()); + Vec3 forward = new Vec3(-Math.sin(yawRadians), 0.0D, Math.cos(yawRadians)); + Vec3 right = new Vec3(forward.z, 0.0D, -forward.x); + Vec3 position = new Vec3( + parent.getX() + forward.x * definition.forwardOffset() + right.x * definition.lateralOffset(), + parent.getY() + definition.yOffset(), + parent.getZ() + forward.z * definition.forwardOffset() + right.z * definition.lateralOffset() + ); + this.setPos(position.x, position.y, position.z); + this.setYRot(parent.getYRot()); + this.setXRot(parent.getXRot()); + this.xo = oldX; + this.yo = oldY; + this.zo = oldZ; + this.xOld = oldX; + this.yOld = oldY; + this.zOld = oldZ; + } + + @Override + public boolean is(Entity entity) { + return entity == this || entity == this.antarchy$getMultipartParent(); + } + + @Override + public boolean isPickable() { + return true; + } + + @Override + public boolean isAttackable() { + return true; + } + + @Override + public boolean isPushable() { + return false; + } + + @Override + public boolean canBeCollidedWith() { + return !this.isRemoved(); + } + + @Override + public boolean canCollideWith(Entity entity) { + MultipartPartDefinition definition = this.definition; + if (definition == null || !definition.collisionEnabled()) { + return false; + } + + Entity parent = this.antarchy$getMultipartParent(); + if (entity == parent) { + return false; + } + + if (entity instanceof MultipartPartEntity otherPart && otherPart.antarchy$getMultipartParent() == parent) { + return false; + } + + return entity.canBeCollidedWith() && !this.isPassengerOfSameVehicle(entity); + } + + @Override + public boolean shouldBeSaved() { + return false; + } + + @Override + public ItemStack getPickResult() { + Entity parent = this.antarchy$getMultipartParent(); + return parent == null ? ItemStack.EMPTY : parent.getPickResult(); + } + + @Override + public boolean hurt(DamageSource source, float amount) { + Entity parent = this.antarchy$getMultipartParent(); + MultipartPartDefinition definition = this.definition; + if (parent == null || definition == null || parent.isRemoved()) { + return false; + } + + if (this.level().isClientSide()) { + if (source.getEntity() instanceof Player) { + MultipartFramework.sendMultipartAttack(parent.getUUID(), this.partIndex, amount * definition.damageMultiplier()); + } + return true; + } + + return this.owner != null && this.owner.antarchy$hurtMultipartPart(this, source, amount * definition.damageMultiplier()); + } + + @Override + public boolean isInvulnerableTo(DamageSource source) { + return false; + } + + @Override + public InteractionResult interactAt(Player player, Vec3 vec, InteractionHand hand) { + Entity parent = this.antarchy$getMultipartParent(); + if (parent == null || parent.isRemoved()) { + return InteractionResult.PASS; + } + + if (this.level().isClientSide()) { + MultipartFramework.sendMultipartInteract(parent.getUUID(), this.partIndex, hand.ordinal()); + return InteractionResult.SUCCESS; + } + + return this.owner == null ? InteractionResult.PASS : this.owner.antarchy$interactMultipartPart(this, player, vec, hand); + } + + @Override + public EntityDimensions getDimensions(Pose pose) { + MultipartPartDefinition definition = this.definition; + return definition == null ? super.getDimensions(pose) : EntityDimensions.scalable(definition.width(), definition.height()); + } + + @Override + protected void defineSynchedData(net.minecraft.network.syncher.SynchedEntityData.Builder builder) { + } + + @Override + protected void readAdditionalSaveData(CompoundTag tag) { + } + + @Override + protected void addAdditionalSaveData(CompoundTag tag) { + } +} diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/MultipartServerPartLevelRegistry.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/MultipartServerPartLevelRegistry.java new file mode 100644 index 00000000..b2b711ba --- /dev/null +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/entity/multipart/MultipartServerPartLevelRegistry.java @@ -0,0 +1,37 @@ +package com.craisinlord.antarchy.fabric.entity.multipart; + +import com.craisinlord.antarchy.content.entity.multipart.MultipartEntityOwner; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.Entity; + +public final class MultipartServerPartLevelRegistry { + private MultipartServerPartLevelRegistry() { + } + + public static void register(MultipartEntityOwner owner) { + Entity[] parts = owner.antarchy$getMultipartParts(); + if (parts == null) { + return; + } + + ServerLevel serverLevel = (ServerLevel) ((Entity) owner).level(); + for (Entity part : parts) { + if (part != null && serverLevel.getEntity(part.getId()) != part) { + serverLevel.addFreshEntity(part); + } + } + } + + public static void unregister(MultipartEntityOwner owner) { + Entity[] parts = owner.antarchy$getMultipartParts(); + if (parts == null) { + return; + } + + for (Entity part : parts) { + if (part != null && !part.isRemoved()) { + part.discard(); + } + } + } +} diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/MultipartClientSpawnMixin.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/MultipartClientSpawnMixin.java new file mode 100644 index 00000000..5968bf07 --- /dev/null +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/MultipartClientSpawnMixin.java @@ -0,0 +1,19 @@ +package com.craisinlord.antarchy.fabric.mixin.client; + +import com.craisinlord.antarchy.fabric.AntarchyFabricContent; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; +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; + +@Mixin(ClientPacketListener.class) +public abstract class MultipartClientSpawnMixin { + @Inject(method = "handleAddEntity", at = @At("HEAD"), cancellable = true) + private void antarchy$skipTrackedMultipartPlaceholders(ClientboundAddEntityPacket packet, CallbackInfo ci) { + if (packet.getType() == AntarchyFabricContent.KRAKEN_PART.get()) { + ci.cancel(); + } + } +} diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/MultipartEntityLevelRegistryMixin.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/MultipartEntityLevelRegistryMixin.java new file mode 100644 index 00000000..1dc6ceaa --- /dev/null +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/MultipartEntityLevelRegistryMixin.java @@ -0,0 +1,34 @@ +package com.craisinlord.antarchy.fabric.mixin.client; + +import com.craisinlord.antarchy.content.entity.multipart.MultipartEntityOwner; +import com.craisinlord.antarchy.fabric.client.multipart.MultipartClientPartLevelRegistry; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.entity.EntityInLevelCallback; +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; + +@Mixin(Entity.class) +public abstract class MultipartEntityLevelRegistryMixin { + @Inject(method = "setLevelCallback", at = @At("TAIL")) + private void antarchy$registerMultipartParts(EntityInLevelCallback entityInLevelCallback, CallbackInfo ci) { + Entity self = (Entity) (Object) this; + if (self instanceof MultipartEntityOwner owner + && entityInLevelCallback != EntityInLevelCallback.NULL + && self.level().isClientSide()) { + if (owner.antarchy$getMultipartParts() == null) { + owner.antarchy$spawnMultipartParts(); + } + MultipartClientPartLevelRegistry.register(owner); + } + } + + @Inject(method = "setRemoved", at = @At("HEAD")) + private void antarchy$unregisterMultipartParts(Entity.RemovalReason removalReason, CallbackInfo ci) { + Entity self = (Entity) (Object) this; + if (self instanceof MultipartEntityOwner owner && self.level().isClientSide()) { + MultipartClientPartLevelRegistry.unregister(owner); + } + } +} diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/entity/MultipartEntityLevelRegistryMixin.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/entity/MultipartEntityLevelRegistryMixin.java new file mode 100644 index 00000000..a2f3c9dc --- /dev/null +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/mixin/entity/MultipartEntityLevelRegistryMixin.java @@ -0,0 +1,37 @@ +package com.craisinlord.antarchy.fabric.mixin.entity; + +import com.craisinlord.antarchy.content.entity.multipart.MultipartEntityOwner; +import com.craisinlord.antarchy.fabric.entity.multipart.MultipartServerPartLevelRegistry; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.entity.EntityInLevelCallback; +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; + +@Mixin(Entity.class) +/* + * Keeps multipart child entities registered in Fabric levels. + */ +public abstract class MultipartEntityLevelRegistryMixin { + @Inject(method = "setLevelCallback", at = @At("TAIL")) + private void antarchy$registerMultipartParts(EntityInLevelCallback entityInLevelCallback, CallbackInfo ci) { + Entity self = (Entity) (Object) this; + if (self instanceof MultipartEntityOwner owner + && entityInLevelCallback != EntityInLevelCallback.NULL + && !self.level().isClientSide()) { + if (owner.antarchy$getMultipartParts() == null) { + owner.antarchy$spawnMultipartParts(); + } + MultipartServerPartLevelRegistry.register(owner); + } + } + + @Inject(method = "setRemoved", at = @At("HEAD")) + private void antarchy$unregisterMultipartParts(Entity.RemovalReason removalReason, CallbackInfo ci) { + Entity self = (Entity) (Object) this; + if (self instanceof MultipartEntityOwner owner && !self.level().isClientSide()) { + MultipartServerPartLevelRegistry.unregister(owner); + } + } +} diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricClientNetworking.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricClientNetworking.java index 13f6b682..c88148ee 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricClientNetworking.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricClientNetworking.java @@ -4,6 +4,9 @@ import com.craisinlord.antarchy.content.client.BloodglassClientState; import com.craisinlord.antarchy.content.client.BrutalflyElytraClientState; import com.craisinlord.antarchy.content.client.ScorpionWhipTetherClientState; import com.craisinlord.antarchy.content.client.ThoraxisWeatherClientState; +import com.craisinlord.antarchy.content.entity.multipart.MultipartFramework; +import com.craisinlord.antarchy.content.entity.multipart.network.MultipartAttackPayload; +import com.craisinlord.antarchy.content.entity.multipart.network.MultipartInteractPayload; import com.craisinlord.antarchy.content.network.*; import com.craisinlord.antarchy.content.weather.ThoraxisWeatherKind; import com.craisinlord.antarchy.fabric.client.BloodCrystalKatanaTrailClientState; @@ -14,6 +17,23 @@ public final class AntarchyFabricClientNetworking { private AntarchyFabricClientNetworking() { } + public static void bootstrapMultipartClient() { + MultipartFramework.bootstrap( + AntarchyFabricNetworking::createMultipartPart, + new MultipartFramework.NetworkBridge() { + @Override + public void sendAttack(java.util.UUID parentId, int partIndex, float damage) { + ClientPlayNetworking.send(new MultipartAttackPayload(parentId, partIndex, damage)); + } + + @Override + public void sendInteract(java.util.UUID parentId, int partIndex, int handId) { + ClientPlayNetworking.send(new MultipartInteractPayload(parentId, partIndex, handId)); + } + } + ); + } + public static void register() { ClientPlayNetworking.registerGlobalReceiver(GravityStatePayload.TYPE, (payload, context) -> context.client().execute(() -> AntarchyFabricNetworking.handleGravityState(context.player(), payload))); diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java index 7ce2d2fe..81ff9284 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java @@ -3,6 +3,7 @@ package com.craisinlord.antarchy.fabric.network; import com.craisinlord.antarchy.content.entity.DiamondMinecartEntity; import com.craisinlord.antarchy.content.client.HerculesBeetleImpactShakeClientState; import com.craisinlord.antarchy.content.entity.multipart.MultipartEntityOwner; +import com.craisinlord.antarchy.content.entity.multipart.MultipartFramework; import com.craisinlord.antarchy.content.entity.multipart.network.MultipartAttackPayload; import com.craisinlord.antarchy.content.entity.multipart.network.MultipartInteractPayload; import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi; @@ -19,6 +20,8 @@ import com.craisinlord.antarchy.content.entity.DorrieEntity; import com.craisinlord.antarchy.content.network.DorrieJumpInputPayload; import com.craisinlord.antarchy.content.network.JumpyBootsLaunchPayload; import com.craisinlord.antarchy.content.weather.ThoraxisWeatherSnapshot; +import com.craisinlord.antarchy.fabric.AntarchyFabricContent; +import com.craisinlord.antarchy.fabric.entity.multipart.MultipartPartEntity; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.PlayerLookup; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; @@ -28,7 +31,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ItemStack; @@ -43,6 +45,26 @@ public final class AntarchyFabricNetworking { registerServerReceivers(); } + public static void bootstrapMultipartCommon() { + MultipartFramework.bootstrap( + AntarchyFabricNetworking::createMultipartPart, + new MultipartFramework.NetworkBridge() { + @Override + public void sendAttack(java.util.UUID parentId, int partIndex, float damage) { + } + + @Override + public void sendInteract(java.util.UUID parentId, int partIndex, int handId) { + } + } + ); + } + + public static MultipartPartEntity createMultipartPart(MultipartEntityOwner owner, int partIndex, com.craisinlord.antarchy.content.entity.multipart.MultipartPartDefinition spec) { + return new MultipartPartEntity(AntarchyFabricContent.KRAKEN_PART.get(), ((Entity) owner).level()) + .antarchy$configure(owner, partIndex, spec); + } + private static void registerPayloadTypes() { PayloadTypeRegistry.playS2C().register(GravityStatePayload.TYPE, GravityStatePayload.STREAM_CODEC); PayloadTypeRegistry.playS2C().register(BloodglassStatePayload.TYPE, BloodglassStatePayload.STREAM_CODEC); @@ -275,8 +297,7 @@ public final class AntarchyFabricNetworking { return; } - DamageSource source = serverPlayer.level().damageSources().playerAttack(serverPlayer); - owner.antarchy$hurtMultipartPart(part, source, payload.damage()); + serverPlayer.attack(part); } private static void handleMultipartInteract(ServerPlayer serverPlayer, MultipartInteractPayload payload) { diff --git a/fabric/src/main/resources/antarchy-fabric.mixins.json b/fabric/src/main/resources/antarchy-fabric.mixins.json index c4066f37..e3f62732 100644 --- a/fabric/src/main/resources/antarchy-fabric.mixins.json +++ b/fabric/src/main/resources/antarchy-fabric.mixins.json @@ -15,6 +15,7 @@ "BloodglassRespawnMixin", "DreamCampfireBlockEntityMixin", "JumpyBootsFallDamageMixin", + "entity.MultipartEntityLevelRegistryMixin", "WoodTypeInvoker", "infinity.RandomSpringMixin", "infinity.PortalCreatorMixin" @@ -24,7 +25,9 @@ "client.DuctTapeInputMixin", "client.AntiwaterFogMixin", "client.GravityGunMouseScrollMixin", - "client.CrossbowArmPoseMixin" + "client.CrossbowArmPoseMixin", + "client.MultipartClientSpawnMixin", + "client.MultipartEntityLevelRegistryMixin" ], "injectors": { "defaultRequire": 1 diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index a17a1eae..639fc562 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -33,6 +33,7 @@ "java": ">=21", "fabric-api": "*", "integrated_api": "*", - "geckolib": "*" + "geckolib": "*", + "sizeable_foliage": "*" } } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 00973c18..5fabcb04 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -37,6 +37,9 @@ dependencies { compileOnly(files(rootProject.file("infinite_dimensions_jars/infinity-2.7.1+1.21.1-neoforge.jar"))) modLocalRuntime(files(rootProject.file("infinite_dimensions_jars/infinity-2.7.1+1.21.1-neoforge.jar"))) + compileOnly(files(rootProject.file("sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar"))) + runtimeOnly(files(rootProject.file("sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar"))) + modLocalRuntime("com.telepathicgrunt:CommandStructures-Neoforge:${project.commandstructures_neoforge}") modLocalRuntime("com.telepathicgrunt:StructureVoidToggle-Neoforge:${project.structurevoidtoggle_neoforge}") diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java index c2e356a0..0d3153a3 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java @@ -199,6 +199,7 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setHerculesBeetleHealth(AntarchyMobsConfig.herculesBeetleHealth()); AntarchySettings.setHerculesBeetleAttackDamage(AntarchyMobsConfig.herculesBeetleAttackDamage()); AntarchySettings.setHerculesBeetleChargeDamage(AntarchyMobsConfig.herculesBeetleChargeDamage()); + AntarchySettings.setGlimmerHealth(AntarchyMobsConfig.glimmerHealth()); } private static void bakeToolsConfig() { diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java index d22259cc..849cce3b 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java @@ -212,6 +212,11 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue DORRIE_HEALTH; + // Glimmer + + private static final ModConfigSpec.DoubleValue GLIMMER_HEALTH; + + // Hercules Beetle private static final ModConfigSpec.DoubleValue HERCULES_BEETLE_HEALTH; @@ -473,7 +478,7 @@ public final class AntarchyMobsConfig { .defineInRange("spawnMaxLightLevel", 5, 0, 15); BASILISK_HEALTH = b.comment("Base max health.").defineInRange("health", 150.0D, 1.0D, 32768.0D); BASILISK_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 36.0D, 0.0D, 1024.0D); - BASILISK_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.35D, 0.0D, 10.0D); + BASILISK_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.28D, 0.0D, 10.0D); BASILISK_ARMOR = b.comment("Base armor value.").defineInRange("armor", 6.0D, 0.0D, 1024.0D); BASILISK_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.5D, 0.0D, 1.0D); BASILISK_FOLLOW_RANGE = b.comment("Base follow range.").defineInRange("followRange", 28.0D, 1.0D, 128.0D); @@ -542,6 +547,10 @@ public final class AntarchyMobsConfig { DORRIE_HEALTH = b.comment("Base max health.").defineInRange("health", 60.0D, 1.0D, 32768.0D); b.pop(); + b.push("glimmer"); + GLIMMER_HEALTH = b.comment("Base max health.").defineInRange("health", 20.0D, 1.0D, 32768.0D); + b.pop(); + b.push("herculesBeetle"); HERCULES_BEETLE_HEALTH = b.comment("Base max health.").defineInRange("health", 500.0D, 1.0D, 32768.0D); HERCULES_BEETLE_ATTACK_DAMAGE = b.comment("Base melee damage for ground and flying attacks.").defineInRange("attackDamage", 30.0D, 0.0D, 1024.0D); @@ -718,6 +727,7 @@ public final class AntarchyMobsConfig { static double cheepHealth() { return CHEEP_HEALTH.get(); } static double cheepAttackDamage() { return CHEEP_ATTACK_DAMAGE.get(); } static double dorrieHealth() { return DORRIE_HEALTH.get(); } + static double glimmerHealth() { return GLIMMER_HEALTH.get(); } static double herculesBeetleHealth() { return HERCULES_BEETLE_HEALTH.get(); } static double herculesBeetleAttackDamage() { return HERCULES_BEETLE_ATTACK_DAMAGE.get(); } static double herculesBeetleChargeDamage() { return HERCULES_BEETLE_CHARGE_DAMAGE.get(); } diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java index dfcbac37..bf604348 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java @@ -15,6 +15,7 @@ import net.neoforged.fml.ModContainer; import net.neoforged.fml.ModList; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.network.PacketDistributor; +import net.minecraft.world.level.block.Blocks; @Mod(Antarchy.MODID) @@ -148,13 +149,13 @@ public class AntarchyNeoforge { AntarchyNeoforgeSounds.TORETERROR_JUMP_UP, AntarchyNeoforgeSounds.TORETERROR_JUMP_LAND, AntarchyNeoforgeSounds.STINKY_FLY, - AntarchyNeoforgeSounds.CREEPING_HORROR_GROWL, - AntarchyNeoforgeSounds.CREEPING_HORROR_HURT, - AntarchyNeoforgeSounds.CREEPING_HORROR_BITE, - AntarchyNeoforgeSounds.LURKING_TERROR_SNARL, - AntarchyNeoforgeSounds.LURKING_TERROR_HURT, - AntarchyNeoforgeSounds.LURKING_TERROR_BITE, - AntarchyNeoforgeSounds.LURKING_TERROR_FLY_LOOP, + AntarchyNeoforgeSounds.ANT_IDLE, + AntarchyNeoforgeSounds.ANT_HURT, + AntarchyNeoforgeSounds.ANT_BITE, + AntarchyNeoforgeSounds.ANT_IDLE, + AntarchyNeoforgeSounds.ANT_HURT, + AntarchyNeoforgeSounds.ANT_BITE, + AntarchyNeoforgeSounds.ANT_IDLE, AntarchyNeoforgeSounds.DUCT_TAPE_USE ); bindCommonObjects(); @@ -189,8 +190,8 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeBlocks.ELYTHIA_PORTAL.get(), () -> AntarchyNeoforgeBlocks.NYXITE.get(), () -> AntarchyNeoforgeBlocks.THORAXIS_PORTAL.get(), - () -> AntarchyNeoforgeBlocks.MYRMITE.get(), - () -> AntarchyNeoforgeBlocks.CAVARYN_PORTAL.get() + () -> AntarchyNeoforgeBlocks.NYXITE.get(), + () -> AntarchyNeoforgeBlocks.THORAXIS_PORTAL.get() ); AntarchyObjects.bind( AntarchyNeoforgeEntites.EASTER_BUNNY, @@ -212,11 +213,11 @@ public class AntarchyNeoforge { AntarchyNeoforgeEntites.HUSH_PROJECTILE, AntarchyNeoforgeEntites.TORETERROR, AntarchyNeoforgeEntites.WATER_BOMB, - AntarchyNeoforgeEntites.CREEPING_HORROR, - AntarchyNeoforgeEntites.LURKING_TERROR, - AntarchyNeoforgeEntites.STINK_BUG, + (java.util.function.Supplier) AntarchyNeoforgeEntites.BOMBER, + (java.util.function.Supplier) AntarchyNeoforgeEntites.BOMBER, + (java.util.function.Supplier) AntarchyNeoforgeEntites.BED_BUG, AntarchyNeoforgeEntites.CHEEP, - AntarchyNeoforgeEntites.DORRIE, + (java.util.function.Supplier) AntarchyNeoforgeEntites.CHEEP, () -> AntarchyNeoforgeBlocks.DUPLICATOR_LOG.get(), () -> AntarchyNeoforgeBlocks.DUPLICATOR_SAPLING.get(), () -> AntarchyNeoforgeBlocks.DUCT_TAPE.get(), @@ -245,8 +246,8 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), () -> AntarchyNeoforgeBlocks.PALE_NYXITE.get(), () -> AntarchyNeoforgeBlocks.NYXITE_SPIKE.get(), - () -> AntarchyNeoforgeBlocks.CHITEN_BLOCK.get(), - () -> AntarchyNeoforgeBlocks.CHITEN_SPIKE.get(), + () -> AntarchyNeoforgeBlocks.NYXITE.get(), + () -> AntarchyNeoforgeBlocks.NYXITE_SPIKE.get(), () -> AntarchyNeoforgeBlocks.POTENT_NYXITE.get(), () -> AntarchyNeoforgeBlocks.ANTIMETAL.get(), () -> AntarchyNeoforgeBlocks.POLISHED_ANTIMETAL.get(), @@ -269,10 +270,9 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeBlocks.MOSSY_OURANWOOD_WOOD.get(), () -> AntarchyNeoforgeBlocks.ORANGE_MILKWEED.get(), () -> AntarchyNeoforgeBlocks.PINK_MILKWEED.get(), - () -> AntarchyNeoforgeBlocks.TORCHFLOWER_BUSH.get(), () -> AntarchyNeoforgeBlocks.BED_BUG_EGG.get(), - () -> AntarchyNeoforgeBlocks.CREEPING_HORROR_EGG.get(), - () -> AntarchyNeoforgeBlocks.LURKING_TERROR_EGG.get(), + () -> AntarchyNeoforgeBlocks.BED_BUG_EGG.get(), + () -> AntarchyNeoforgeBlocks.BED_BUG_EGG.get(), () -> AntarchyNeoforgeBlocks.WASP_NEST.get(), () -> AntarchyNeoforgeBlocks.HUSHWEED.get(), () -> AntarchyNeoforgeBlocks.OURANWOOD_SQUIRREL_NEST.get(), @@ -287,8 +287,9 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeMisc.BLOODGLASS_MAX_HEARTS, () -> AntarchyNeoforgeMisc.BLOODGLASS_WARD ); - AntarchyObjects.setHerculesBeetle(AntarchyNeoforgeEntites.HERCULES_BEETLE); AntarchyObjects.setOctopusBomb(AntarchyNeoforgeEntites.OCTOPUS_BOMB); + // AntarchyObjects.setGlimmer(AntarchyNeoforgeEntites.GLIMMER); + // AntarchyObjects.setGlimmersGrace(() -> AntarchyNeoforgeMisc.GLIMMERS_GRACE); } private static boolean isModLoaded(String modId) { diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java index b15a8a38..1e5af0fe 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java @@ -91,11 +91,9 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.RED_ANT.get(), context -> withParalyzedGeoLayer(new AntRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BROWN_ANT.get(), context -> withParalyzedGeoLayer(new AntRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.RAINBOW_ANT.get(), context -> withParalyzedGeoLayer(new AntRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.TERMITE.get(), context -> withParalyzedGeoLayer(new TermiteRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.MOLEWORM.get(), context -> withParalyzedGeoLayer(new MolewormRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.MANTIS.get(), context -> withParalyzedGeoLayer(new MantisRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.ALPHA_MANTIS.get(), context -> withParalyzedGeoLayer(new AlphaMantisRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.ROLLY_POLLY.get(), context -> withParalyzedGeoLayer(new RollyPollyRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.MOLEVORE.get(), context -> withParalyzedGeoLayer(new MolevoreRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.TRIFFID.get(), context -> withParalyzedGeoLayer(new TriffidRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.OURANWOOD_BOAT_ENTITY.get(), context -> new OuranwoodBoatRenderer<>(context, OURANWOOD_BOAT_TEXTURE, false)); @@ -112,11 +110,8 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.NIGHTMARE.get(), context -> withParalyzedGeoLayer(new NightmareRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.LUCID.get(), context -> withParalyzedGeoLayer(new LucidRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BED_BUG.get(), context -> withParalyzedGeoLayer(new BedBugRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.STINK_BUG.get(), context -> withParalyzedGeoLayer(new StinkBugRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.WASP.get(), context -> withParalyzedGeoLayer(new WaspRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BOMBER.get(), context -> withParalyzedGeoLayer(new BomberRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.JUMPY_BUG.get(), context -> withParalyzedGeoLayer(new JumpyBugRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.SPIT_BUG.get(), context -> withParalyzedGeoLayer(new SpitBugRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BASILISK.get(), context -> withParalyzedGeoLayer(new BasiliskRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.SHRINK_RAY_PROJECTILE.get(), SizeRayProjectileRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.GROWTH_RAY_PROJECTILE.get(), SizeRayProjectileRenderer::new); @@ -124,17 +119,13 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.LUCID_PEARL_PROJECTILE.get(), ThrownItemRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.HUSH_PROJECTILE.get(), HushProjectileRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.BRUTALFLY_ORB.get(), BrutalflyOrbRenderer::new); - event.registerEntityRenderer(AntarchyNeoforgeEntites.SPIT_BUG_PROJECTILE.get(), SpitBugProjectileRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.UPWARD_FALLING_BLOCK.get(), com.craisinlord.antarchy.content.client.renderer.UpwardFallingBlockRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.SCORPION.get(), context -> withParalyzedGeoLayer(new ScorpionRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), context -> withParalyzedGeoLayer(new EmperorScorpionRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.TORETERROR.get(), ToreterrorRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.WATER_BOMB.get(), WaterBombRenderer::new); - event.registerEntityRenderer(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), CreepingHorrorRenderer::new); - event.registerEntityRenderer(AntarchyNeoforgeEntites.LURKING_TERROR.get(), LurkingTerrorRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.CHEEP.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.CheepRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.DORRIE.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.DorrieRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.HERCULES_BEETLE.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.HerculesBeetleRenderer(context))); + // event.registerEntityRenderer(AntarchyNeoforgeEntites.GLIMMER.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.GlimmerRenderer(context))); } @SubscribeEvent @@ -201,11 +192,7 @@ public final class AntarchyNeoForgeClient { event.register( (state, level, pos, tintIndex) -> level != null && pos != null ? BiomeColors.getAverageGrassColor(level, pos) - : net.minecraft.world.level.GrassColor.getDefaultColor(), - AntarchyNeoforgeBlocks.BIG_BUSH.get(), - AntarchyNeoforgeBlocks.BIG_BUSH_PART.get(), - AntarchyNeoforgeBlocks.VERY_SHORT_GRASS.get(), - AntarchyNeoforgeBlocks.VERY_TALL_GRASS.get() + : net.minecraft.world.level.GrassColor.getDefaultColor() ); } @@ -216,10 +203,7 @@ public final class AntarchyNeoForgeClient { AntarchyNeoforgeItems.OURANWOOD_LEAVES_ITEM.get() ); event.register( - (stack, tintIndex) -> net.minecraft.world.level.GrassColor.getDefaultColor(), - AntarchyNeoforgeItems.BIG_BUSH_ITEM.get(), - AntarchyNeoforgeItems.VERY_SHORT_GRASS_ITEM.get(), - AntarchyNeoforgeItems.VERY_TALL_GRASS_ITEM.get() + (stack, tintIndex) -> net.minecraft.world.level.GrassColor.getDefaultColor() ); event.register(new DynamicFluidContainerModel.Colors(), AntarchyNeoforgeItems.ICHOR_BUCKET.get()); event.register(new DynamicFluidContainerModel.Colors(), AntarchyNeoforgeItems.ANTIWATER_BUCKET.get()); @@ -438,21 +422,11 @@ public final class AntarchyNeoForgeClient { ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.DUPLICATOR_SAPLING.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ORANGE_MILKWEED.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PINK_MILKWEED.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.TORCHFLOWER_BUSH.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.BIG_BUSH.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.BIG_BUSH_PART.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.VERY_SHORT_GRASS.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.VERY_TALL_GRASS.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.HUSHWEED.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CORNEA_STALK.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ANTIMETAL_SCAFFOLDING.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.UMBRAL_MOSS_CARPET.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.AMBER_MOSS_CARPET.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.AMBER_LICHEN.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.BILE_VEIN.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CREEPVINE.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.NYXITE_SPIKE.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CHITEN_SPIKE.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.SMALL_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.MEDIUM_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.LARGE_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); @@ -466,7 +440,6 @@ public final class AntarchyNeoForgeClient { ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ANTIWATER_BLOCK.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ELYTHIA_PORTAL.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.THORAXIS_PORTAL.get(), RenderType.translucent()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CAVARYN_PORTAL.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.URANIUM_DOOR.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.TITANIUM_DOOR.get(), RenderType.cutout()); diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/BigBushHideHandler.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/BigBushHideHandler.java deleted file mode 100644 index f383a7c8..00000000 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/BigBushHideHandler.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.craisinlord.antarchy.neoforge.client; - -import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.client.BigBushCameraHider; -import net.minecraft.client.Minecraft; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.neoforge.client.event.ClientTickEvent; - -@EventBusSubscriber(modid = Antarchy.MODID, value = Dist.CLIENT, bus = EventBusSubscriber.Bus.GAME) -public final class BigBushHideHandler { - private BigBushHideHandler() { - } - - @SubscribeEvent - public static void onClientTick(ClientTickEvent.Post event) { - BigBushCameraHider.update(Minecraft.getInstance()); - } -} diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java index 3e999d49..e12edd0a 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java @@ -1119,13 +1119,7 @@ public final class AntarchyNeoForgeEvents { ); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.UMBRAL_MOSS_BLOCK.get().asItem(), 0.65f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.UMBRAL_MOSS_CARPET.get().asItem(), 0.3f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.AMBER_MOSS_BLOCK.get().asItem(), 0.65f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.AMBER_MOSS_CARPET.get().asItem(), 0.3f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.BIG_BUSH.get().asItem(), 0.65f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.CREEPVINE.get().asItem(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.HUSHWEED.get().asItem(), 0.65f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.VERY_SHORT_GRASS.get().asItem(), 0.3f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.VERY_TALL_GRASS.get().asItem(), 0.5f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeItems.CORNEA_EAR.get(), 0.65f); }); } diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java index 73697cb1..a77b7f12 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java @@ -4,8 +4,6 @@ import com.craisinlord.antarchy.Antarchy; import com.craisinlord.antarchy.config.AntarchySettings; import com.craisinlord.antarchy.content.AntarchyObjects; import com.craisinlord.antarchy.content.block.*; -import com.craisinlord.antarchy.content.block.CreepingHorrorEggBlock; -import com.craisinlord.antarchy.content.block.LurkingTerrorEggBlock; import com.craisinlord.antarchy.content.block.entity.AntNestBlockEntity; import com.craisinlord.antarchy.content.block.entity.DreamCampfireBlockEntity; import com.craisinlord.antarchy.content.block.entity.HushweedBlockEntity; @@ -85,30 +83,6 @@ public final class AntarchyNeoforgeBlocks { () -> new MilkweedBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.PEONY))); public static final DeferredBlock PINK_MILKWEED = BLOCKS.register("pink_milkweed", () -> new MilkweedBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.PEONY))); - public static final DeferredBlock TORCHFLOWER_BUSH = BLOCKS.register("torchflower_bush", - () -> new TorchflowerBushBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.PEONY) - .lightLevel(state -> AntarchySettings.glowingTorchflowers() ? 15 : 0))); - public static final DeferredBlock VERY_SHORT_GRASS = BLOCKS.register("very_short_grass", - () -> new VeryShortGrassBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SHORT_GRASS))); - public static final DeferredBlock VERY_TALL_GRASS = BLOCKS.register("very_tall_grass", - () -> new VeryTallGrassBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TALL_GRASS))); - public static final DeferredBlock BIG_BUSH = BLOCKS.register("big_bush", - () -> new BigBushBlock(BlockBehaviour.Properties.of() - .mapColor(net.minecraft.world.level.material.MapColor.PLANT) - .noCollission() - .instabreak() - .sound(SoundType.GRASS) - .ignitedByLava() - .pushReaction(net.minecraft.world.level.material.PushReaction.DESTROY))); - public static final DeferredBlock BIG_BUSH_PART = BLOCKS.register("big_bush_part", - () -> new BigBushPartBlock(BlockBehaviour.Properties.of() - .mapColor(net.minecraft.world.level.material.MapColor.PLANT) - .noCollission() - .instabreak() - .sound(SoundType.GRASS) - .ignitedByLava() - .pushReaction(net.minecraft.world.level.material.PushReaction.DESTROY) - .noLootTable())); public static final DeferredBlock OURANWOOD_SIGN = BLOCKS.register("ouranwood_sign", () -> new StandingSignBlock(OuranwoodWoodTypes.OURANWOOD, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_SIGN))); public static final DeferredBlock OURANWOOD_WALL_SIGN = BLOCKS.register("ouranwood_wall_sign", @@ -202,39 +176,19 @@ public final class AntarchyNeoforgeBlocks { () -> new AntDimensionPortalBlock(PermanentPortalType.ELYTHIA, portalProperties())); public static final DeferredBlock THORAXIS_PORTAL = BLOCKS.register("thoraxis_portal", () -> new AntDimensionPortalBlock(PermanentPortalType.THORAXIS, portalProperties())); - public static final DeferredBlock CAVARYN_PORTAL = BLOCKS.register("cavaryn_portal", - () -> new AntDimensionPortalBlock(PermanentPortalType.CAVARYN, portalProperties())); public static final DeferredBlock PALE_NYXITE = BLOCKS.register("pale_nyxite", () -> new Block(nyxiteProperties())); public static final DeferredBlock NYXITE_SPIKE = BLOCKS.register("nyxite_spike", () -> new NyxiteSpikeBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POINTED_DRIPSTONE))); - public static final DeferredBlock CHITEN_SPIKE = BLOCKS.register("chiten_spike", - () -> new ChitenSpikeBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POINTED_DRIPSTONE))); public static final DeferredBlock POTENT_NYXITE = BLOCKS.register("potent_nyxite", () -> new PotentNyxiteBlock( AntarchyNeoforgeItems::potentNyxiteBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERRACK).lightLevel(state -> 3) )); - public static final DeferredBlock MYRMITE = BLOCKS.register("myrmite", - () -> new Block(nyxiteProperties())); - public static final DeferredBlock BROODSTONE = BLOCKS.register("broodstone", - () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.DEEPSLATE).requiresCorrectToolForDrops())); - public static final DeferredBlock CHITEN_BLOCK = BLOCKS.register("chiten_block", - () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BONE_BLOCK).requiresCorrectToolForDrops())); public static final DeferredBlock UMBRAL_MOSS_BLOCK = BLOCKS.register("umbral_moss_block", () -> new UmbralMossBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_BLOCK))); public static final DeferredBlock UMBRAL_MOSS_CARPET = BLOCKS.register("umbral_moss_carpet", () -> new UmbralMossCarpetBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_CARPET).noOcclusion())); - public static final DeferredBlock AMBER_MOSS_BLOCK = BLOCKS.register("amber_moss_block", - () -> new AmberMossBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_BLOCK))); - public static final DeferredBlock AMBER_MOSS_CARPET = BLOCKS.register("amber_moss_carpet", - () -> new UmbralMossCarpetBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_CARPET).noOcclusion())); - public static final DeferredBlock AMBER_LICHEN = BLOCKS.register("amber_lichen", - () -> new GlowLichenBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.GLOW_LICHEN).lightLevel(state -> 4))); - public static final DeferredBlock BILE_VEIN = BLOCKS.register("bile_vein", - () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERRACK))); - public static final DeferredBlock CREEPVINE = BLOCKS.register("creepvine", - () -> new VineBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.VINE))); public static final DeferredBlock DREAM_TORCH = BLOCKS.register("dream_torch", () -> new DreamTorchBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SOUL_TORCH))); public static final DeferredBlock DREAM_WALL_TORCH = BLOCKS.register("dream_wall_torch", @@ -255,10 +209,6 @@ public final class AntarchyNeoforgeBlocks { .noOcclusion() .noCollission() .replaceable())); - public static final DeferredBlock CREEPING_HORROR_EGG = BLOCKS.register("creeping_horror_egg", - () -> new CreepingHorrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); - public static final DeferredBlock LURKING_TERROR_EGG = BLOCKS.register("lurking_terror_egg", - () -> new LurkingTerrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); public static final DeferredBlock WASP_NEST = BLOCKS.register("wasp_nest", () -> new WaspNestBlock(AntarchyNeoforgeItems::waspNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.BEE_NEST))); public static final DeferredBlock OURANWOOD_SQUIRREL_NEST = BLOCKS.register("ouranwood_squirrel_nest", @@ -285,8 +235,6 @@ public final class AntarchyNeoforgeBlocks { () -> new AntNestBlock(AntarchyNeoforgeEntites.BROWN_ANT, AntarchyNeoforgeItems::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); public static final DeferredBlock RAINBOW_ANT_NEST = BLOCKS.register("rainbow_ant_nest", () -> new AntNestBlock(AntarchyNeoforgeEntites.RAINBOW_ANT, AntarchyNeoforgeItems::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); - public static final DeferredBlock TERMITE_NEST = BLOCKS.register("termite_nest", - () -> new AntNestBlock(AntarchyNeoforgeEntites.TERMITE, AntarchyNeoforgeItems::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); public static final DeferredBlock URANIUM_ORE = BLOCKS.register("uranium_ore", () -> createOre(Blocks.EMERALD_ORE, 4, 8)); public static final DeferredBlock DEEPSLATE_URANIUM_ORE = BLOCKS.register("deepslate_uranium_ore", @@ -397,8 +345,7 @@ public final class AntarchyNeoforgeBlocks { AntNestBlockEntity::new, RED_ANT_NEST.get(), BROWN_ANT_NEST.get(), - RAINBOW_ANT_NEST.get(), - TERMITE_NEST.get() + RAINBOW_ANT_NEST.get() ).build(null)); public static final DeferredHolder, BlockEntityType> DREAM_CAMPFIRE_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("dream_campfire", () -> BlockEntityType.Builder.of( diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeCreativeModeTabs.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeCreativeModeTabs.java index 83b4c767..d67baf59 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeCreativeModeTabs.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeCreativeModeTabs.java @@ -57,11 +57,9 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.RED_ANT_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.BROWN_ANT_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.RAINBOW_ANT_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.TERMITE_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.MOLEWORM_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.MANTIS_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.ALPHA_MANTIS_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.ROLLY_POLLY_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.MOLEVORE_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.TRIFFID_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.APPLE_COW_SPAWN_EGG.get()); @@ -70,9 +68,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.DR_TRAYAURUS_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.WASP_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.BOMBER_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.JUMPY_BUG_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.SPIT_BUG_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.STINK_BUG_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.CLOUD_SHARK_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.KRAKEN_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.MISSILE_SQUID_SPAWN_EGG.get()); @@ -84,8 +79,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.BASILISK_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.EMPEROR_SCORPION_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.TORETERROR_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.CREEPING_HORROR_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.LURKING_TERROR_SPAWN_EGG.get()); } if (event.getTabKey() == CreativeModeTabs.NATURAL_BLOCKS) { @@ -96,24 +89,15 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.DUPLICATOR_SAPLING_ITEM.get()); event.accept(AntarchyNeoforgeItems.ORANGE_MILKWEED_ITEM.get()); event.accept(AntarchyNeoforgeItems.PINK_MILKWEED_ITEM.get()); - event.accept(AntarchyNeoforgeItems.TORCHFLOWER_BUSH_ITEM.get()); - event.accept(AntarchyNeoforgeItems.BIG_BUSH_ITEM.get()); - event.accept(AntarchyNeoforgeItems.VERY_SHORT_GRASS_ITEM.get()); - event.accept(AntarchyNeoforgeItems.VERY_TALL_GRASS_ITEM.get()); event.accept(AntarchyNeoforgeItems.HUSHWEED_ITEM.get()); - event.accept(AntarchyNeoforgeItems.AMBER_LICHEN_ITEM.get()); - event.accept(AntarchyNeoforgeItems.CREEPVINE_ITEM.get()); event.accept(AntarchyNeoforgeItems.INFESTED_ROOTED_DIRT_ITEM.get()); event.accept(AntarchyNeoforgeItems.INFESTED_COARSE_DIRT_ITEM.get()); event.accept(AntarchyNeoforgeItems.TRIFFID_GOO_BLOCK_ITEM.get()); event.accept(AntarchyNeoforgeItems.BED_BUG_EGG_ITEM.get()); - event.accept(AntarchyNeoforgeItems.CREEPING_HORROR_EGG_ITEM.get()); - event.accept(AntarchyNeoforgeItems.LURKING_TERROR_EGG_ITEM.get()); event.accept(AntarchyNeoforgeItems.WASP_NEST_ITEM.get()); event.accept(AntarchyNeoforgeItems.RED_ANT_NEST_ITEM.get()); event.accept(AntarchyNeoforgeItems.BROWN_ANT_NEST_ITEM.get()); event.accept(AntarchyNeoforgeItems.RAINBOW_ANT_NEST_ITEM.get()); - event.accept(AntarchyNeoforgeItems.TERMITE_NEST_ITEM.get()); event.accept(AntarchyNeoforgeItems.URANIUM_ORE_ITEM.get()); event.accept(AntarchyNeoforgeItems.DEEPSLATE_URANIUM_ORE_ITEM.get()); event.accept(AntarchyNeoforgeItems.TITANIUM_ORE_ITEM.get()); @@ -156,7 +140,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.MANTIS_CLAW.get()); event.accept(AntarchyNeoforgeItems.KING_SCALE.get()); event.accept(AntarchyNeoforgeItems.QUEEN_SCALE.get()); - event.accept(AntarchyNeoforgeItems.CHITEN.get()); event.accept(AntarchyNeoforgeItems.STINK_BUG.get()); event.accept(AntarchyNeoforgeItems.BRUTALFLY_WING.get()); event.accept(AntarchyNeoforgeItems.PRIMORDIAL_SCUTE.get()); @@ -251,13 +234,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.SMALL_BLOOD_CRYSTAL_BUD_ITEM.get()); event.accept(AntarchyNeoforgeItems.MEDIUM_BLOOD_CRYSTAL_BUD_ITEM.get()); event.accept(AntarchyNeoforgeItems.LARGE_BLOOD_CRYSTAL_BUD_ITEM.get()); - event.accept(AntarchyNeoforgeItems.MYRMITE_ITEM.get()); - event.accept(AntarchyNeoforgeItems.BROODSTONE_ITEM.get()); - event.accept(AntarchyNeoforgeItems.BILE_VEIN_ITEM.get()); - event.accept(AntarchyNeoforgeItems.CHITEN_BLOCK_ITEM.get()); - event.accept(AntarchyNeoforgeItems.CHITEN_SPIKE_ITEM.get()); - event.accept(AntarchyNeoforgeItems.AMBER_MOSS_BLOCK_ITEM.get()); - event.accept(AntarchyNeoforgeItems.AMBER_MOSS_CARPET_ITEM.get()); event.accept(AntarchyNeoforgeItems.URANIUM_BLOCK_ITEM.get()); event.accept(AntarchyNeoforgeItems.RAW_URANIUM_BLOCK_ITEM.get()); event.accept(AntarchyNeoforgeItems.CUT_URANIUM_ITEM.get()); @@ -397,7 +373,7 @@ public class AntarchyNeoforgeCreativeModeTabs { case "duplicator_sapling", "ouranwood_acorn" -> 10; // 11 - Plants and flowers - case "orange_milkweed", "pink_milkweed", "torchflower_bush", "big_bush", "very_short_grass", "very_tall_grass", "hushweed", "amber_lichen", "bile_vein", "creepvine", + case "orange_milkweed", "pink_milkweed", "hushweed", "amber_lichen", "creepvine", "triffid_goo_block", "wasp_nest", "red_ant_nest", "brown_ant_nest", "rainbow_ant_nest", "termite_nest" -> 11; diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java index 35501ae8..14b26395 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java @@ -14,6 +14,7 @@ import com.craisinlord.antarchy.content.entity.DiamondMinecartEntity; import com.craisinlord.antarchy.content.entity.DrTrayaurusEntity; import com.craisinlord.antarchy.content.entity.EasterBunnyEntity; import com.craisinlord.antarchy.content.entity.EmperorScorpionEntity; +import com.craisinlord.antarchy.content.entity.GlimmerEntity; import com.craisinlord.antarchy.content.entity.HushProjectileEntity; import com.craisinlord.antarchy.content.entity.HerculesBeetleEntity; import com.craisinlord.antarchy.content.entity.JumpyBugEntity; @@ -29,8 +30,6 @@ import com.craisinlord.antarchy.content.entity.OuranwoodChestBoatEntity; import com.craisinlord.antarchy.content.entity.ReverieEntity; import com.craisinlord.antarchy.content.entity.ScorpionEntity; import com.craisinlord.antarchy.content.entity.SizeRayProjectileEntity; -import com.craisinlord.antarchy.content.entity.SpitBugEntity; -import com.craisinlord.antarchy.content.entity.SpitBugProjectileEntity; import com.craisinlord.antarchy.content.entity.StinkBugEntity; import com.craisinlord.antarchy.content.entity.TriffidEntity; import com.craisinlord.antarchy.content.entity.UpwardFallingBlockEntity; @@ -132,11 +131,6 @@ public final class AntarchyNeoforgeEntites { .sized(1.15F, 0.8F) .clientTrackingRange(8) .build("bed_bug")); - public static final DeferredHolder, EntityType> STINK_BUG = ENTITY_TYPES.register("stink_bug", - () -> EntityType.Builder.of(StinkBugEntity::new, MobCategory.CREATURE) - .sized(0.35F, 0.2F) - .clientTrackingRange(8) - .build("stink_bug")); public static final DeferredHolder, EntityType> WASP = ENTITY_TYPES.register("wasp", () -> EntityType.Builder.of(WaspEntity::new, MobCategory.MONSTER) .sized(0.8625F, 1.365F) @@ -147,22 +141,6 @@ public final class AntarchyNeoforgeEntites { .sized(0.55F, 0.75F) .clientTrackingRange(8) .build("bomber")); - public static final DeferredHolder, EntityType> JUMPY_BUG = ENTITY_TYPES.register("jumpy_bug", - () -> EntityType.Builder.of(JumpyBugEntity::new, MobCategory.MONSTER) - .sized(3.0F, 3.0F) - .clientTrackingRange(8) - .build("jumpy_bug")); - public static final DeferredHolder, EntityType> SPIT_BUG = ENTITY_TYPES.register("spit_bug", - () -> EntityType.Builder.of(SpitBugEntity::new, MobCategory.MONSTER) - .sized(2.5F, 3.0F) - .clientTrackingRange(10) - .build("spit_bug")); - public static final DeferredHolder, EntityType> SPIT_BUG_PROJECTILE = ENTITY_TYPES.register("spit_bug_projectile", - () -> EntityType.Builder.of(SpitBugProjectileEntity::new, MobCategory.MISC) - .sized(0.5F, 0.5F) - .clientTrackingRange(8) - .updateInterval(1) - .build("spit_bug_projectile")); public static final DeferredHolder, EntityType> SHRINK_RAY_PROJECTILE = ENTITY_TYPES.register("shrink_ray_projectile", () -> EntityType.Builder.of(SizeRayProjectileEntity::createShrink, MobCategory.MISC) .sized(0.5F, 0.5F) @@ -304,31 +282,16 @@ public final class AntarchyNeoforgeEntites { .clientTrackingRange(8) .updateInterval(1) .build("water_bomb")); - public static final DeferredHolder, EntityType> CREEPING_HORROR = ENTITY_TYPES.register("creeping_horror", - () -> EntityType.Builder.of(CreepingHorrorEntity::new, MobCategory.MONSTER) - .sized(1.3F, 1.5F) - .clientTrackingRange(10) - .build("creeping_horror")); - public static final DeferredHolder, EntityType> LURKING_TERROR = ENTITY_TYPES.register("lurking_terror", - () -> EntityType.Builder.of(LurkingTerrorEntity::new, MobCategory.MONSTER) - .sized(1.3F, 1.5F) - .clientTrackingRange(10) - .build("lurking_terror")); public static final DeferredHolder, EntityType> CHEEP = ENTITY_TYPES.register("cheep", () -> EntityType.Builder.of(CheepEntity::new, MobCategory.WATER_AMBIENT) .sized(1.0F, 1.2F) .clientTrackingRange(8) .build("cheep")); - public static final DeferredHolder, EntityType> DORRIE = ENTITY_TYPES.register("dorrie", - () -> EntityType.Builder.of(DorrieEntity::new, MobCategory.WATER_CREATURE) - .sized(2.4F, 2.0F) - .clientTrackingRange(10) - .build("dorrie")); - public static final DeferredHolder, EntityType> HERCULES_BEETLE = ENTITY_TYPES.register("hercules_beetle", - () -> EntityType.Builder.of(HerculesBeetleEntity::new, MobCategory.MONSTER) - .sized(3.0F, 4.0F) - .clientTrackingRange(12) - .build("hercules_beetle")); + // public static final DeferredHolder, EntityType> GLIMMER = ENTITY_TYPES.register("glimmer", + // () -> EntityType.Builder.of(GlimmerEntity::new, MobCategory.CREATURE) + // .sized(0.9F, 1.4F) + // .clientTrackingRange(8) + // .build("glimmer")); public static final DeferredHolder, EntityType> UPWARD_FALLING_BLOCK = ENTITY_TYPES.register("upward_falling_block", () -> EntityType.Builder.of( UpwardFallingBlockEntity::new, MobCategory.MISC) diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java index 48d6f92e..701ce974 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java @@ -47,36 +47,27 @@ public class AntarchyNeoforgeEntityAttributes { event.put(AntarchyNeoforgeEntites.OCTOPUS_BOMB.get(), OctopusBombEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.NIGHTMARE.get(), NightmareEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.BED_BUG.get(), BedBugEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.STINK_BUG.get(), StinkBugEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.WASP.get(), WaspEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.BOMBER.get(), BomberEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.JUMPY_BUG.get(), JumpyBugEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.SPIT_BUG.get(), SpitBugEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.MANTIS.get(), MantisEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.ALPHA_MANTIS.get(), AlphaMantisEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.ROLLY_POLLY.get(), RollyPollyEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.TRIFFID.get(), TriffidEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.LUCID.get(), LucidEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.SCORPION.get(), ScorpionEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.BASILISK.get(), BasiliskEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), EmperorScorpionEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.TORETERROR.get(), ToreterrorEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), CreepingHorrorEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.LURKING_TERROR.get(), LurkingTerrorEntity.createAttributes().build()); AttributeSupplier redAntAttributes = buildAntAttributes(AntarchySettings.redAntHealth(), AntarchySettings.redAntMovementSpeed(), AntarchySettings.redAntAttackDamage()).build(); AttributeSupplier brownAntAttributes = buildAntAttributes(AntarchySettings.brownAntHealth(), AntarchySettings.brownAntMovementSpeed(), AntarchySettings.brownAntAttackDamage()).build(); AttributeSupplier rainbowAntAttributes = buildAntAttributes(AntarchySettings.rainbowAntHealth(), AntarchySettings.rainbowAntMovementSpeed(), AntarchySettings.rainbowAntAttackDamage()).build(); - AttributeSupplier termiteAttributes = buildAntAttributes(AntarchySettings.termiteHealth(), AntarchySettings.termiteMovementSpeed(), AntarchySettings.termiteAttackDamage()).build(); event.put(AntarchyNeoforgeEntites.RED_ANT.get(), redAntAttributes); event.put(AntarchyNeoforgeEntites.BROWN_ANT.get(), brownAntAttributes); event.put(AntarchyNeoforgeEntites.RAINBOW_ANT.get(), rainbowAntAttributes); - event.put(AntarchyNeoforgeEntites.TERMITE.get(), termiteAttributes); event.put(AntarchyNeoforgeEntites.MOLEWORM.get(), MolewormEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.MOLEVORE.get(), MolevoreEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.CHEEP.get(), com.craisinlord.antarchy.content.entity.CheepEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.DORRIE.get(), com.craisinlord.antarchy.content.entity.DorrieEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.HERCULES_BEETLE.get(), com.craisinlord.antarchy.content.entity.HerculesBeetleEntity.createAttributes().build()); + // event.put(AntarchyNeoforgeEntites.GLIMMER.get(), com.craisinlord.antarchy.content.entity.GlimmerEntity.createAttributes().build()); } private static AttributeSupplier.Builder buildAntAttributes(double health, double speed, double attackDamage) { diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java index f7645752..d253f105 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java @@ -161,11 +161,6 @@ public final class AntarchyNeoforgeItems { // public static final DeferredItem OURANWOOD_VINE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.OURANWOOD_VINE); public static final DeferredItem ORANGE_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.ORANGE_MILKWEED); public static final DeferredItem PINK_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PINK_MILKWEED); - public static final DeferredItem TORCHFLOWER_BUSH_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.TORCHFLOWER_BUSH); - public static final DeferredItem VERY_SHORT_GRASS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.VERY_SHORT_GRASS); - public static final DeferredItem VERY_TALL_GRASS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.VERY_TALL_GRASS); - public static final DeferredItem BIG_BUSH_ITEM = ITEMS.register("big_bush", - () -> new com.craisinlord.antarchy.content.item.BigBushBlockItem(AntarchyNeoforgeBlocks.BIG_BUSH.get(), new Item.Properties())); public static final DeferredItem OURANWOOD_SIGN_ITEM = ITEMS.register("ouranwood_sign", () -> new net.minecraft.world.item.SignItem(new Item.Properties().stacksTo(16), AntarchyNeoforgeBlocks.OURANWOOD_SIGN.get(), AntarchyNeoforgeBlocks.OURANWOOD_WALL_SIGN.get())); public static final DeferredItem OURANWOOD_HANGING_SIGN_ITEM = ITEMS.register("ouranwood_hanging_sign", @@ -178,7 +173,6 @@ public final class AntarchyNeoforgeItems { public static final DeferredItem RED_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.RED_ANT_NEST); public static final DeferredItem BROWN_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BROWN_ANT_NEST); public static final DeferredItem RAINBOW_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.RAINBOW_ANT_NEST); - public static final DeferredItem TERMITE_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.TERMITE_NEST); public static final DeferredItem URANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.URANIUM_ORE); public static final DeferredItem DEEPSLATE_URANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.DEEPSLATE_URANIUM_ORE); public static final DeferredItem TITANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.TITANIUM_ORE); @@ -234,12 +228,9 @@ public final class AntarchyNeoforgeItems { public static final DeferredItem INFESTED_ROOTED_DIRT_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.INFESTED_ROOTED_DIRT); public static final DeferredItem INFESTED_COARSE_DIRT_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.INFESTED_COARSE_DIRT); public static final DeferredItem NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE); - public static final DeferredItem MYRMITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.MYRMITE); - public static final DeferredItem BROODSTONE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BROODSTONE); public static final DeferredItem POLISHED_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.POLISHED_NYXITE); public static final DeferredItem CHISELED_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CHISELED_NYXITE); public static final DeferredItem NYXITE_BRICKS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_BRICKS); - public static final DeferredItem CHITEN_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CHITEN_BLOCK); public static final DeferredItem NYXITE_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_STAIRS); public static final DeferredItem NYXITE_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_SLAB); public static final DeferredItem NYXITE_WALL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_WALL); @@ -271,22 +262,14 @@ public final class AntarchyNeoforgeItems { () -> new com.craisinlord.antarchy.content.item.TriffidGooBlockItem(AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), new Item.Properties())); public static final DeferredItem PALE_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PALE_NYXITE); public static final DeferredItem NYXITE_SPIKE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_SPIKE); - public static final DeferredItem CHITEN_SPIKE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CHITEN_SPIKE); public static final DeferredItem POTENT_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.POTENT_NYXITE); public static final DeferredItem UMBRAL_MOSS_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.UMBRAL_MOSS_BLOCK); public static final DeferredItem UMBRAL_MOSS_CARPET_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.UMBRAL_MOSS_CARPET); - public static final DeferredItem AMBER_MOSS_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.AMBER_MOSS_BLOCK); - public static final DeferredItem AMBER_MOSS_CARPET_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.AMBER_MOSS_CARPET); - public static final DeferredItem AMBER_LICHEN_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.AMBER_LICHEN); - public static final DeferredItem BILE_VEIN_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BILE_VEIN); - public static final DeferredItem CREEPVINE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CREEPVINE); public static final DeferredItem DREAM_TORCH_ITEM = ITEMS.register("dream_torch", () -> new StandingAndWallBlockItem(AntarchyNeoforgeBlocks.DREAM_TORCH.get(), AntarchyNeoforgeBlocks.DREAM_WALL_TORCH.get(), new Item.Properties(), net.minecraft.core.Direction.UP)); public static final DeferredItem DREAM_LANTERN_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.DREAM_LANTERN); public static final DeferredItem DREAM_CAMPFIRE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.DREAM_CAMPFIRE); public static final DeferredItem BED_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BED_BUG_EGG); - public static final DeferredItem CREEPING_HORROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CREEPING_HORROR_EGG); - public static final DeferredItem LURKING_TERROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.LURKING_TERROR_EGG); public static final DeferredItem WASP_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.WASP_NEST); public static final DeferredItem HUSHWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.HUSHWEED); public static final DeferredItem BILE_BUCKET = ITEMS.register("bile_bucket", @@ -328,9 +311,10 @@ public final class AntarchyNeoforgeItems { () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE))); public static final DeferredItem QUEEN_SCALE = ITEMS.register("queen_scale", () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE))); - public static final DeferredItem CHITEN = ITEMS.registerSimpleItem("chiten", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem STINK_BUG = ITEMS.registerSimpleItem("stink_bug", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem JUMPY_BUG_LEG = ITEMS.registerSimpleItem("jumpy_bug_leg", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final DeferredItem STINK_BUG = ITEMS.register("stink_bug", + () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.UNCOMMON))); + public static final DeferredItem JUMPY_BUG_LEG = ITEMS.register("jumpy_bug_leg", + () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.UNCOMMON))); public static final DeferredItem JUMPY_BOOTS = ITEMS.register("jumpy_boots", () -> new JumpyBootsItem(JUMPY_BOOTS_ARMOR_MATERIAL, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).fireResistant().durability(ArmorItem.Type.BOOTS.getDurability(37)))); public static final DeferredItem BRUTALFLY_WING = ITEMS.registerSimpleItem("brutalfly_wing", new Item.Properties().rarity(Rarity.UNCOMMON)); @@ -496,6 +480,8 @@ public final class AntarchyNeoforgeItems { // Spawn eggs public static final DeferredItem EASTER_BUNNY_SPAWN_EGG = ITEMS.register("easter_bunny_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.EASTER_BUNNY, 0xFFF2B2, 0xFF85B5, new Item.Properties())); + // public static final DeferredItem GLIMMER_SPAWN_EGG = ITEMS.register("glimmer_spawn_egg", + // () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.GLIMMER, 0xBEEFFF, 0x6FD8FF, new Item.Properties())); public static final DeferredItem FLYING_SQUIRREL_SPAWN_EGG = ITEMS.register("flying_squirrel_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.FLYING_SQUIRREL, 0x7D6649, 0xDCC59C, new Item.Properties())); public static final DeferredItem CATERPILLAR_SPAWN_EGG = ITEMS.register("caterpillar_spawn_egg", @@ -512,16 +498,12 @@ public final class AntarchyNeoforgeItems { () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.BROWN_ANT, 0x6A4320, 0x26160A, new Item.Properties())); public static final DeferredItem RAINBOW_ANT_SPAWN_EGG = ITEMS.register("rainbow_ant_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.RAINBOW_ANT, 0x56D4F0, 0xF66DBB, new Item.Properties())); - public static final DeferredItem TERMITE_SPAWN_EGG = ITEMS.register("termite_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.TERMITE, 0xD4B96A, 0xFF6B1A, new Item.Properties())); public static final DeferredItem MOLEWORM_SPAWN_EGG = ITEMS.register("moleworm_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.MOLEWORM, 0xB8B8B8, 0x8A623A, new Item.Properties())); public static final DeferredItem MANTIS_SPAWN_EGG = ITEMS.register("mantis_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.MANTIS, 0xF8F8F2, 0x63B44A, new Item.Properties())); public static final DeferredItem ALPHA_MANTIS_SPAWN_EGG = ITEMS.register("alpha_mantis_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.ALPHA_MANTIS, 0x8FDD6C, 0x2F5D22, new Item.Properties().rarity(Rarity.UNCOMMON))); - public static final DeferredItem ROLLY_POLLY_SPAWN_EGG = ITEMS.register("rolly_polly_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.ROLLY_POLLY, 0x7284A3, 0xBCC8DB, new Item.Properties())); public static final DeferredItem MOLEVORE_SPAWN_EGG = ITEMS.register("molevore_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.MOLEVORE, 0x4A4A4A, 0x6B4A2B, new Item.Properties().rarity(Rarity.UNCOMMON))); public static final DeferredItem TRIFFID_SPAWN_EGG = ITEMS.register("triffid_spawn_egg", @@ -538,12 +520,6 @@ public final class AntarchyNeoforgeItems { () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.WASP, 0x111111, 0xF1D800, new Item.Properties())); public static final DeferredItem BOMBER_SPAWN_EGG = ITEMS.register("bomber_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.BOMBER, 0x7A7A7A, 0xB32020, new Item.Properties())); - public static final DeferredItem JUMPY_BUG_SPAWN_EGG = ITEMS.register("jumpy_bug_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.JUMPY_BUG, 0x0A1636, 0x8A3E00, new Item.Properties())); - public static final DeferredItem SPIT_BUG_SPAWN_EGG = ITEMS.register("spit_bug_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.SPIT_BUG, 0x6B4A2B, 0x7ED957, new Item.Properties())); - public static final DeferredItem STINK_BUG_SPAWN_EGG = ITEMS.register("stink_bug_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.STINK_BUG, 0x111111, 0xFF7A00, new Item.Properties())); public static final DeferredItem CLOUD_SHARK_SPAWN_EGG = ITEMS.register("cloud_shark_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CLOUD_SHARK, 0xDDEAF4, 0x7F96A8, new Item.Properties())); public static final DeferredItem KRAKEN_SPAWN_EGG = ITEMS.register("kraken_spawn_egg", @@ -583,16 +559,8 @@ public final class AntarchyNeoforgeItems { () -> new PrimordialArmorItem(PRIMORDIAL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1).rarity(Rarity.RARE).fireResistant())); public static final DeferredItem TORETERROR_SPAWN_EGG = ITEMS.register("toreterror_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.TORETERROR, 0x90EE90, 0x5C4033, new Item.Properties().rarity(Rarity.EPIC))); - public static final DeferredItem CREEPING_HORROR_SPAWN_EGG = ITEMS.register("creeping_horror_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CREEPING_HORROR, 0x6B3A1F, 0x6B0000, new Item.Properties())); - public static final DeferredItem LURKING_TERROR_SPAWN_EGG = ITEMS.register("lurking_terror_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.LURKING_TERROR, 0x2D5A1B, 0x8B0000, new Item.Properties())); public static final DeferredItem CHEEP_SPAWN_EGG = ITEMS.register("cheep_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CHEEP, 0xAA22FF, 0x22FF44, new Item.Properties())); - public static final DeferredItem DORRIE_SPAWN_EGG = ITEMS.register("dorrie_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.DORRIE, 0x1B91B3, 0xC0E8FF, new Item.Properties())); - public static final DeferredItem HERCULES_BEETLE_SPAWN_EGG = ITEMS.register("hercules_beetle_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.HERCULES_BEETLE, 0x6B1F2A, 0xD4AF37, new Item.Properties().rarity(Rarity.RARE))); private AntarchyNeoforgeItems() {} diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java index f1dbcb58..e067e82d 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java @@ -4,6 +4,7 @@ import com.craisinlord.antarchy.Antarchy; import com.craisinlord.antarchy.content.client.particle.InvertedGeyserBaseParticleOptions; import com.craisinlord.antarchy.content.client.particle.InvertedGeyserParticleOptions; import com.craisinlord.antarchy.content.effect.DreadMobEffect; +import com.craisinlord.antarchy.content.effect.GlimmersGraceMobEffect; import com.craisinlord.antarchy.content.effect.GrowthMobEffect; import com.craisinlord.antarchy.content.effect.InvertedMobEffect; import com.craisinlord.antarchy.content.effect.ParalyzedMobEffect; @@ -12,18 +13,8 @@ import com.craisinlord.antarchy.content.effect.StinkyMobEffect; import com.craisinlord.antarchy.content.worldgen.ants.BrownAntNestFeature; import com.craisinlord.antarchy.content.worldgen.ants.RainbowAntNestFeature; import com.craisinlord.antarchy.content.worldgen.ants.RedAntNestFeature; -import com.craisinlord.antarchy.content.worldgen.ants.TermiteNestFeature; -import com.craisinlord.antarchy.content.worldgen.cavaryn.CavarynBileCystFeature; -import com.craisinlord.antarchy.content.worldgen.cavaryn.CavarynBileVeinFeature; -import com.craisinlord.antarchy.content.worldgen.cavaryn.CavarynCreepvineFeature; -import com.craisinlord.antarchy.content.worldgen.cavaryn.CavarynEggPatchFeature; -import com.craisinlord.antarchy.content.worldgen.cavaryn.CavarynWallAmberMossFeature; -import com.craisinlord.antarchy.content.worldgen.cavaryn.ChitenSpikeConfiguration; -import com.craisinlord.antarchy.content.worldgen.cavaryn.ChitenSpikeFeature; import com.craisinlord.antarchy.content.worldgen.elythia.*; import com.craisinlord.antarchy.content.worldgen.thoraxis.*; -import com.craisinlord.antarchy.content.worldgen.VeryTallGrassWorldgenFeature; -import com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature; import com.craisinlord.antarchy.neoforge.content.fluid.AntiwaterFluid; import com.craisinlord.antarchy.neoforge.content.fluid.AntiwaterFluidType; import com.mojang.serialization.MapCodec; @@ -83,6 +74,7 @@ public final class AntarchyNeoforgeMisc { public static final DeferredHolder BLOODGLASS_WARD = MOB_EFFECTS.register("bloodglass_ward", com.craisinlord.antarchy.content.effect.BloodglassWardEffect::new); public static final DeferredHolder SHRINKING_EFFECT = MOB_EFFECTS.register("shrinking", ShrinkMobEffect::new); public static final DeferredHolder GROWTH_EFFECT = MOB_EFFECTS.register("growth", GrowthMobEffect::new); + // public static final DeferredHolder GLIMMERS_GRACE = MOB_EFFECTS.register("glimmers_grace", GlimmersGraceMobEffect::new); // Potions public static final DeferredHolder INVERSION = POTIONS.register("inversion", @@ -193,8 +185,6 @@ public final class AntarchyNeoforgeMisc { () -> new BrownAntNestFeature(SimpleBlockConfiguration.CODEC)); public static final DeferredHolder, RainbowAntNestFeature> RAINBOW_ANT_NEST_FEATURE = FEATURES.register("rainbow_ant_nest", () -> new RainbowAntNestFeature(SimpleBlockConfiguration.CODEC)); - public static final DeferredHolder, TermiteNestFeature> TERMITE_NEST_FEATURE = FEATURES.register("termite_nest", - () -> new TermiteNestFeature(SimpleBlockConfiguration.CODEC)); public static final DeferredHolder, OuranwoodTreeFeature> OURANWOOD_LARGE_TREE = FEATURES.register("ouranwood_large_tree", () -> new OuranwoodTreeFeature(OuranwoodTreeConfiguration.CODEC)); public static final DeferredHolder, OuranwoodTreeFeature> OURANWOOD_YOUNG_TREE = FEATURES.register("ouranwood_young_tree", @@ -215,12 +205,6 @@ public final class AntarchyNeoforgeMisc { () -> new ElythiaFloraFeature(NoneFeatureConfiguration.CODEC, ElythiaFloraFeature.Variant.TORCHFLOWER_FIELDS)); public static final DeferredHolder, ElythiaSurfaceCoverFeature> ELYTHIA_SURFACE_COVER = FEATURES.register("elythia_surface_cover", () -> new ElythiaSurfaceCoverFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, VeryTallGrassWorldgenFeature> VERY_TALL_GRASS_FEATURE = FEATURES.register("very_tall_grass", - () -> new VeryTallGrassWorldgenFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, BigBushWorldgenFeature> BIG_BUSH_2X2_FEATURE = FEATURES.register("big_bush_2x2", - () -> new BigBushWorldgenFeature(NoneFeatureConfiguration.CODEC, 1)); - public static final DeferredHolder, BigBushWorldgenFeature> BIG_BUSH_3X3_FEATURE = FEATURES.register("big_bush_3x3", - () -> new BigBushWorldgenFeature(NoneFeatureConfiguration.CODEC, 2)); public static final DeferredHolder, ElythiaUndergroundFeature> ELYTHIA_UNDERGROUND = FEATURES.register("elythia_underground", () -> new ElythiaUndergroundFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, BrutalflyCocoonFeature> BRUTALFLY_COCOON = FEATURES.register("brutalfly_cocoon", @@ -255,16 +239,6 @@ public final class AntarchyNeoforgeMisc { () -> new ThoraxisSpikeFeature(ThoraxisSpikeConfiguration.CODEC)); public static final DeferredHolder, NyxiteSpikeFeature> NYXITE_SPIKES = FEATURES.register("nyxite_spikes", () -> new NyxiteSpikeFeature(NyxiteSpikeConfiguration.CODEC)); - public static final DeferredHolder, ChitenSpikeFeature> CAVARYN_CHITEN_SPIKES = FEATURES.register("cavaryn_chiten_spikes", - () -> new ChitenSpikeFeature(ChitenSpikeConfiguration.CODEC)); - public static final DeferredHolder, CavarynBileVeinFeature> CAVARYN_BILE_VEINS = FEATURES.register("cavaryn_bile_veins", - () -> new CavarynBileVeinFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynBileCystFeature> CAVARYN_BILE_CYSTS = FEATURES.register("cavaryn_bile_cysts", - () -> new CavarynBileCystFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynCreepvineFeature> CAVARYN_CREEPVINE = FEATURES.register("cavaryn_creepvine", - () -> new CavarynCreepvineFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynWallAmberMossFeature> CAVARYN_WALL_AMBER_MOSS = FEATURES.register("cavaryn_wall_amber_moss", - () -> new CavarynWallAmberMossFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, AntiwaterSpringsFeature> ANTIWATER_SPRINGS = FEATURES.register("antiwater_springs", () -> new AntiwaterSpringsFeature(AntiwaterSpringsConfiguration.CODEC)); public static final DeferredHolder, PotentNyxiteFeature> POTENT_NYXITE_FEATURE = FEATURES.register("potent_nyxite", @@ -277,8 +251,6 @@ public final class AntarchyNeoforgeMisc { () -> new BedBugNestFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, BedBugSurfaceClusterFeature> BED_BUG_SURFACE_CLUSTER = FEATURES.register("bed_bug_surface_cluster", () -> new BedBugSurfaceClusterFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynEggPatchFeature> CAVARYN_TERROR_EGG_PATCH = FEATURES.register("cavaryn_terror_egg_patch", - () -> new CavarynEggPatchFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, ThoraxisAntiwaterPoolFeature> THORAXIS_ANTIWATER_POOL = FEATURES.register("thoraxis_antiwater_pool", () -> new ThoraxisAntiwaterPoolFeature(ThoraxisAntiwaterPoolConfiguration.CODEC)); public static final DeferredHolder, LucidAntiwaterPoolFeature> LUCID_ANTIWATER_POOL = FEATURES.register("lucid_antiwater_pool", diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java index c0af0888..8a6b7ccc 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java @@ -34,8 +34,6 @@ public class AntarchyNeoforgeSpawnPlacements { event.register(AntarchyNeoforgeEntites.CLOUD_SHARK.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CloudSharkEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.WASP.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, WaspEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.BOMBER.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BomberEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.JUMPY_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, JumpyBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.SPIT_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, SpitBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.KRAKEN.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, KrakenEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.MISSILE_SQUID.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MissileSquidEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.OCTOPUS_BOMB.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, OctopusBombEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); @@ -45,14 +43,11 @@ public class AntarchyNeoforgeSpawnPlacements { event.register(AntarchyNeoforgeEntites.ALPHA_MANTIS.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, AlphaMantisEntity::checkAlphaMantisSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.MOLEVORE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MolevoreEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.BED_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BedBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.STINK_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, StinkBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.LUCID.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, LucidEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, ScorpionEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.BASILISK.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BasiliskEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EmperorScorpionEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CreepingHorrorEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.LURKING_TERROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, LurkingTerrorEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.TERMITE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.Animal::checkAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.CHEEP.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, AbstractFish::checkSurfaceWaterAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); + // event.register(AntarchyNeoforgeEntites.GLIMMER.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.Animal::checkAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); } } diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index be0d7086..3c6b4e34 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -4,7 +4,7 @@ license="All rights reserved" [[mods]] #mandatory modId="antarchy" #mandatory -logoFile="../assets/antarchy_/antarchy_logo.png" +logoFile="../assets/antarchy/antarchy_logo.png" logoBlur=false version="${version}" #mandatory displayName="Antarchy" #mandatory @@ -37,4 +37,11 @@ displayURL="https://www.curseforge.com/minecraft/mc-mods/antarchy" type="required" versionRange="*" ordering="AFTER" + side="BOTH" + +[[dependencies.antarchy]] + modId="sizeable_foliage" + type="required" + versionRange="*" + ordering="AFTER" side="BOTH" \ No newline at end of file diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/ant_nests_in_forests.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/ant_nests_in_forests.json index 684bd2ee..0fecae7d 100644 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/ant_nests_in_forests.json +++ b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/ant_nests_in_forests.json @@ -1,10 +1,9 @@ { - "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" + "type": "neoforge:add_features", + "biomes": "#antarchy:overworld_ant_nest_spawn_biomes", + "features": [ + "antarchy:brown_ant_nest", + "antarchy:rainbow_ant_nest" + ], + "step": "vegetal_decoration" } diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush.json deleted file mode 100644 index 190035c7..00000000 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "neoforge:add_features", - "biomes": "#antarchy:big_bush_spawn_biomes", - "features": [ - "antarchy:big_bush" - ], - "step": "vegetal_decoration" -} diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush_2x2.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush_2x2.json deleted file mode 100644 index 27409ca0..00000000 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush_2x2.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "neoforge:add_features", - "biomes": "#antarchy:big_bush_2x2_spawn_biomes", - "features": [ - "antarchy:big_bush_2x2" - ], - "step": "vegetal_decoration" -} diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush_3x3.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush_3x3.json deleted file mode 100644 index a32da043..00000000 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/big_bush_3x3.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "neoforge:add_features", - "biomes": "#antarchy:mega_taiga_spawn_biomes", - "features": [ - "antarchy:big_bush_3x3" - ], - "step": "vegetal_decoration" -} diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/remove_glow_lichen_from_cavaryn.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/remove_glow_lichen_from_cavaryn.json deleted file mode 100644 index 206947e6..00000000 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/remove_glow_lichen_from_cavaryn.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "neoforge:remove_features", - "biomes": "#antarchy:is_cavaryn", - "features": [ - "minecraft:glow_lichen" - ], - "step": "vegetal_decoration" -} diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/very_short_grass.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/very_short_grass.json deleted file mode 100644 index 32d32d1f..00000000 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/very_short_grass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "neoforge:add_features", - "biomes": "#antarchy:very_short_grass_spawn_biomes", - "features": [ - "antarchy:very_short_grass" - ], - "step": "vegetal_decoration" -} diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/very_tall_grass.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/very_tall_grass.json deleted file mode 100644 index b1930fe7..00000000 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/very_tall_grass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "neoforge:add_features", - "biomes": "#antarchy:very_tall_grass_spawn_biomes", - "features": [ - "antarchy:very_tall_grass" - ], - "step": "vegetal_decoration" -} diff --git a/sizeable_foliage_jars/sizeable_foliage-fabric-1.21.1-1.0.0.jar b/sizeable_foliage_jars/sizeable_foliage-fabric-1.21.1-1.0.0.jar new file mode 100644 index 00000000..86173754 Binary files /dev/null and b/sizeable_foliage_jars/sizeable_foliage-fabric-1.21.1-1.0.0.jar differ diff --git a/sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar b/sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar new file mode 100644 index 00000000..3243f2f7 Binary files /dev/null and b/sizeable_foliage_jars/sizeable_foliage-neoforge-1.21.1-1.0.0.jar differ