Merge pull request #81 from craisinlord/anthology-split

2.2.6

common-1.20.1/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java

@@ -107,9 +107,6 @@ public final class AntarchySettings {
     private static int ultimateCrossbowEnchantability = 20;
     private static int ultimateMaceEnchantability = 20;
     private static boolean ultimateToolsThreeByThreeEnabled = true;
-    private static boolean ultimateToolsVeinMiningEnabled = true;
-    private static int ultimateToolsVeinMiningMaxBlocks = 64;
-    private static int ultimateToolsTreeFellingMaxLogs = 128;
     private static boolean ultimateArmorComesEnchanted = true;
     private static int ultimateHelmetArmorValue = 6;
     private static int ultimateChestplateArmorValue = 11;
@@ -302,7 +299,6 @@ public final class AntarchySettings {
     private static double royalBossKnockbackResistance = 1.0D;
     private static double royalBossStepHeight = 3.0D;
     private static double royalBossMaxSingleHitDamage = 250.0D;
-    private static double royalBossHitOverflowRate = 0.25D;
     private static double royalBossBiteReach = 12.0D;
     private static double royalBossBiteDamageMultiplier = 1.6D;
     private static int royalBossBiteCooldownTicks = 45;
@@ -978,18 +974,6 @@ public final class AntarchySettings {
         return ultimateToolsThreeByThreeEnabled;
     }
 
-    public static boolean ultimateToolsVeinMiningEnabled() {
-        return ultimateToolsVeinMiningEnabled;
-    }
-
-    public static int ultimateToolsVeinMiningMaxBlocks() {
-        return ultimateToolsVeinMiningMaxBlocks;
-    }
-
-    public static int ultimateToolsTreeFellingMaxLogs() {
-        return ultimateToolsTreeFellingMaxLogs;
-    }
-
     public static boolean ultimateArmorComesEnchanted() {
         return ultimateArmorComesEnchanted;
     }
@@ -1640,18 +1624,6 @@ public final class AntarchySettings {
         ultimateToolsThreeByThreeEnabled = value;
     }
 
-    public static void setUltimateToolsVeinMiningEnabled(boolean value) {
-        ultimateToolsVeinMiningEnabled = value;
-    }
-
-    public static void setUltimateToolsVeinMiningMaxBlocks(int value) {
-        ultimateToolsVeinMiningMaxBlocks = value;
-    }
-
-    public static void setUltimateToolsTreeFellingMaxLogs(int value) {
-        ultimateToolsTreeFellingMaxLogs = value;
-    }
-
     public static void setUltimateArmorComesEnchanted(boolean value) {
         ultimateArmorComesEnchanted = value;
     }
@@ -2257,9 +2229,6 @@ public final class AntarchySettings {
     public static double royalBossMaxSingleHitDamage() { return royalBossMaxSingleHitDamage; }
     public static void setRoyalBossMaxSingleHitDamage(double v) { royalBossMaxSingleHitDamage = v; }
 
-    public static double royalBossHitOverflowRate() { return royalBossHitOverflowRate; }
-    public static void setRoyalBossHitOverflowRate(double v) { royalBossHitOverflowRate = v; }
-
     public static double royalBossBiteReach() { return royalBossBiteReach; }
     public static void setRoyalBossBiteReach(double v) { royalBossBiteReach = v; }
 

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java

@@ -11,7 +11,6 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.material.Fluid;
 
 public final class AntarchyTags {
@@ -158,11 +157,4 @@ public final class AntarchyTags {
         private Biomes() {
         }
     }
-
-    public static final class DimensionTypes {
-        public static final TagKey<DimensionType> NO_MANTIS_CLIMB = TagKey.create(Registries.DIMENSION_TYPE, id("no_mantis_climb"));
-
-        private DimensionTypes() {
-        }
-    }
 }

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/client/model/RoyalMountModel.java

@@ -11,12 +11,6 @@ import software.bernie.geckolib.model.GeoModel;
 
 public class RoyalMountModel extends GeoModel<RoyalMountEntity> {
     private static final String[] HEADS = {"head_left", "head", "head_right"};
-    private static final String[] RIDDEN_NECK_CHAIN = {
-            "neck", "neck2", "neck3", "head",
-            "neck_left", "neck_left2", "neck_left3", "head_left",
-            "neck_right", "neck_right2", "neck_right3", "head_right"
-    };
-    private static final float RIDDEN_NECK_RAISE = 0.35F;
 
     @Override
     public ResourceLocation getModelResource(RoyalMountEntity animatable) {
@@ -37,11 +31,6 @@ public class RoyalMountModel extends GeoModel<RoyalMountEntity> {
     public void setCustomAnimations(RoyalMountEntity animatable, long instanceId,
                                     AnimationState<RoyalMountEntity> animationState) {
         super.setCustomAnimations(animatable, instanceId, animationState);
-        if (animatable.isVehicle()) {
-            for (String name : RIDDEN_NECK_CHAIN) {
-                this.getBone(name).ifPresent(bone -> bone.setRotX(bone.getRotX() * RIDDEN_NECK_RAISE));
-            }
-        }
         for (String head : HEADS) {
             this.getBone(head).ifPresent(bone -> bone.setTrackingMatrices(true));
         }

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/effect/BloodglassWardEffect.java

@@ -21,7 +21,6 @@ public final class BloodglassWardEffect extends MobEffect {
     public void addAttributeModifiers(net.minecraft.world.entity.LivingEntity livingEntity, AttributeMap attributeMap, int amplifier) {
         AttributeInstance instance = attributeMap.getInstance(AntarchyObjects.BLOODGLASS_MAX_HEARTS.get());
         if (instance == null) return;
-        instance.removeModifier(MODIFIER_ID);
         instance.addTransientModifier(
                 new AttributeModifier(MODIFIER_ID, "bloodglass_ward_hearts", amplifier + 1, AttributeModifier.Operation.ADDITION)
         );

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/HerculesBeetleEntity.java

@@ -392,9 +392,6 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
         if (this.isKnockedDown()) {
             this.tickKnockedDown();
         } else if (this.isLeashed()) {
-            if (this.chargeTicksRemaining > 0 || this.isChargeAnimationActive()) {
-                this.endChargeState();
-            }
             this.getNavigation().stop();
             this.setTarget(null);
             this.updateAmbientAnimation();
@@ -487,10 +484,6 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
     }
 
     private void tickCharge() {
-        if (this.chargeTicksRemaining <= 0) {
-            this.endChargeState();
-            return;
-        }
         if (this.getAnimationState() != ANIM_CHARGE) {
             this.setAnimationState(ANIM_CHARGE);
         }
@@ -917,9 +910,6 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
         if (!this.isFlying() && !mountedCharge) {
             this.pendingChargeStart = true;
             this.requestFlightStart();
-            if (this.getAnimationState() != ANIM_OPEN_WINGS) {
-                this.pendingChargeStart = false;
-            }
             return;
         }
         this.beginChargeStart(this.chargeDirection, this.pendingChargeDuration, mountedCharge);
@@ -989,23 +979,13 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
         serverLevel.sendParticles(ParticleTypes.CRIT, this.getX(), this.getY() + 0.8D, this.getZ(), 20, 2.0D, 0.6D, 2.0D, 0.08D);
         this.broadcastImpactShake(serverLevel);
 
-        this.endChargeState();
-    }
-
-    private void endChargeState() {
-        this.chargeTicksRemaining = 0;
-        this.groundedMountedCharge = false;
-        this.noPhysics = false;
-        this.setAnimationState(this.isFlying() ? ANIM_FLY : ANIM_IDLE);
-        if (!this.isVehicle() && this.isFlying() && this.hasGroundBelow()) {
+        if (this.onGround()) {
             this.requestFlightStop();
+        } else {
+            this.updateAmbientAnimation();
         }
     }
 
-    private boolean hasGroundBelow() {
-        return !this.level().noCollision(this, this.getBoundingBox().move(this.toWorld(0.0D, -0.2D, 0.0D)));
-    }
-
     private void breakBlocksForChargeImpact(ServerLevel level) {
         if (!this.isHerculesBeetleGriefingEnabled(level)) {
             return;
@@ -1444,9 +1424,6 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
         this.chargeCooldown = tag.getInt("ChargeCooldown");
         this.attackCooldown = tag.getInt("AttackCooldown");
         this.combatCryDone = tag.getBoolean("CombatCryDone");
-        if (this.isChargeAnimationActive()) {
-            this.setAnimationState(this.isFlying() ? ANIM_FLY : ANIM_IDLE);
-        }
         if (this.isKnockedDown() && this.getAnimationState() != ANIM_KNOCKED_DOWN_IDLE) {
             this.setAnimationState(ANIM_KNOCKED_DOWN_IDLE);
         }

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/brutalfly/BrutalflyEntity.java

@@ -40,8 +40,6 @@ import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.navigation.FlyingPathNavigation;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
 import net.minecraft.world.entity.monster.Monster;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ServerLevelAccessor;
 import net.minecraft.world.level.Level;
@@ -87,7 +85,7 @@ public class BrutalflyEntity extends Monster implements GeoEntity {
     private static final int SPIT_WINDUP_TICKS = 16;
     private static final int SWIPE_TICKS = 18;
     private static final float SWIPE_KNOCKBACK = 2.8F;
-    private static final int COCOON_HIT_THRESHOLD = 5;
+    private static final int COCOON_HIT_THRESHOLD = 3;
     private static final int COCOON_HIT_COOLDOWN_TICKS = 60;
     private static final int COCOON_HIT_ANIM_TICKS = 30;
     private static final int COCOON_HATCH_ANIM_TICKS = 40;
@@ -339,12 +337,6 @@ public class BrutalflyEntity extends Monster implements GeoEntity {
         if (nearbyPlayer != null && !nearbyPlayer.isCreative() && !nearbyPlayer.isSpectator()) {
             this.setTarget(nearbyPlayer);
         }
-        this.spitCooldown = 0;
-    }
-
-    public float getDamageScale() {
-        double base = AntarchySettings.brutalflySwipeDamage();
-        return base <= 0.0D ? 1.0F : (float) (this.getAttributeValue(Attributes.ATTACK_DAMAGE) / base);
     }
 
     public boolean isCocooned() {
@@ -522,11 +514,6 @@ public class BrutalflyEntity extends Monster implements GeoEntity {
         this.playSound(AntarchySoundEvents.BRUTALFLY_SPIT.get(), 1.0F, 0.9F + this.random.nextFloat() * 0.2F);
         switch (this.getFightPhase()) {
             case PHASE_THREE -> {
-                this.launchOrb(serverLevel, origin, target, BrutalflyOrbEntity.OrbVariant.POISON, -14.0F);
-                this.launchOrb(serverLevel, origin, target, BrutalflyOrbEntity.OrbVariant.STICKY, 0.0F);
-                this.launchOrb(serverLevel, origin, target, BrutalflyOrbEntity.OrbVariant.POISON, 14.0F);
-            }
-            case PHASE_TWO -> {
                 this.launchOrb(serverLevel, origin, target, BrutalflyOrbEntity.OrbVariant.POISON, -8.0F);
                 this.launchOrb(serverLevel, origin, target, BrutalflyOrbEntity.OrbVariant.STICKY, 8.0F);
             }
@@ -599,8 +586,7 @@ public class BrutalflyEntity extends Monster implements GeoEntity {
     }
 
     private void performSwipeHit() {
-        float swipeDamage = (float) this.getAttributeValue(Attributes.ATTACK_DAMAGE);
-        boolean finalPhase = this.getFightPhase() == FightPhase.PHASE_THREE;
+        float swipeDamage = (float) AntarchySettings.brutalflySwipeDamage();
         AABB attackBox = this.getBoundingBox().inflate(4.8D, 2.4D, 4.8D).expandTowards(0.0D, -2.5D, 0.0D);
         for (LivingEntity target : this.level().getEntitiesOfClass(
                 LivingEntity.class,
@@ -612,9 +598,6 @@ public class BrutalflyEntity extends Monster implements GeoEntity {
             }
 
             target.hurt(this.damageSources().mobAttack(this), swipeDamage);
-            if (finalPhase) {
-                target.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 60, 1, false, true));
-            }
 
             double dx = target.getX() - this.getX();
             double dz = target.getZ() - this.getZ();

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/brutalfly/BrutalflyOrbEntity.java

@@ -162,9 +162,6 @@ public class BrutalflyOrbEntity extends ThrowableItemProjectile {
         if (!this.level().isClientSide && result.getEntity() instanceof LivingEntity livingTarget) {
             float directHitDamage = (float) AntarchySettings.brutalflySpitDamage();
             Entity owner = this.getOwner();
-            if (owner instanceof BrutalflyEntity brutalfly) {
-                directHitDamage *= brutalfly.getDamageScale();
-            }
             if (owner instanceof LivingEntity livingOwner) {
                 livingTarget.hurt(this.damageSources().mobProjectile(this, livingOwner), directHitDamage);
             } else {

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/PrinceEntity.java

@@ -3,31 +3,13 @@ package com.craisinlord.antarchy.content.entity.royal;
 import com.craisinlord.antarchy.config.AntarchySettings;
 import com.craisinlord.antarchy.content.AntarchyObjects;
 import com.craisinlord.antarchy.content.AntarchySoundEvents;
-import com.craisinlord.antarchy.content.effect.RoyalEffectEligibility;
-import com.craisinlord.antarchy.content.effect.RoyalEffectHooks;
 import com.craisinlord.antarchy.content.entity.royal.beam.RoyalBeamElement;
-import java.util.Comparator;
-import java.util.List;
-import net.minecraft.core.particles.DustParticleOptions;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.util.Mth;
-import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
-import net.minecraft.world.entity.monster.Enemy;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.Nullable;
-import org.joml.Vector3f;
 
 public class PrinceEntity extends RoyalMountEntity {
-    private static final DustParticleOptions COMMAND_DUST = new DustParticleOptions(new Vector3f(1.0F, 0.75F, 0.15F), 1.6F);
-
     public PrinceEntity(EntityType<? extends PrinceEntity> entityType, Level level) {
         super(entityType, level);
     }
@@ -58,117 +40,6 @@ public class PrinceEntity extends RoyalMountEntity {
         };
     }
 
-    @Override
-    protected ParticleOptions beamWindupParticle() {
-        return switch (this.getBeamElement()) {
-            case FIRE -> ParticleTypes.FLAME;
-            case ICE -> ParticleTypes.SNOWFLAKE;
-            default -> ParticleTypes.ELECTRIC_SPARK;
-        };
-    }
-
-    @Override
-    protected float beamBaseDamage() {
-        return 12.0F;
-    }
-
-    @Override
-    public boolean prefersAerialCombat() {
-        return false;
-    }
-
-    @Override
-    public double preferredCombatRange() {
-        return 0.0D;
-    }
-
-    @Override
-    protected float biteWeight() {
-        return 3.0F;
-    }
-
-    @Override
-    protected float spitWeight() {
-        return 1.0F;
-    }
-
-    @Override
-    protected float beamWeight() {
-        return 1.2F;
-    }
-
-    @Override
-    protected float signatureWeight() {
-        return 4.0F;
-    }
-
-    @Override
-    protected int signatureCooldownTicks() {
-        return 360;
-    }
-
-    private double commandRadius() {
-        return 14.0D + 2.0D * this.getGrowthScale();
-    }
-
-    private int commandLimit() {
-        return 3 + Mth.floor(this.getGrowthScale());
-    }
-
-    private List<Mob> commandCandidates(Vec3 center) {
-        double radius = this.commandRadius();
-        return this.level().getEntitiesOfClass(Mob.class, this.getBoundingBox().inflate(radius), mob ->
-                mob != this && mob.isAlive() && mob instanceof Enemy && !mob.isAlliedTo(this)
-                        && !(mob instanceof RoyalBossEntity) && RoyalEffectEligibility.canApplyCommanded(mob)
-                        && RoyalEffectHooks.commandedHolder() != null
-                        && !mob.hasEffect(RoyalEffectHooks.commandedHolder())
-                        && mob.distanceToSqr(center) <= radius * radius);
-    }
-
-    @Override
-    protected boolean isSignatureUseful(LivingEntity target) {
-        return RoyalEffectHooks.commandedHolder() != null && this.commandCandidates(this.position()).size() >= 2;
-    }
-
-    @Override
-    protected void signatureTelegraph(ServerLevel level, int tick, @Nullable LivingEntity target, @Nullable Vec3 aimPoint) {
-        if (tick % 3 != 0) {
-            return;
-        }
-        double radius = (this.getBbWidth() * 0.5D + 1.0D) + tick * 0.25D * this.getGrowthScale();
-        for (int i = 0; i < 16; i++) {
-            double angle = i * Mth.TWO_PI / 16.0D + tick * 0.1D;
-            level.sendParticles(COMMAND_DUST, this.getX() + Math.cos(angle) * radius, this.getY() + 0.3D,
-                    this.getZ() + Math.sin(angle) * radius, 1, 0.0D, 0.05D, 0.0D, 0.0D);
-        }
-        if (tick == 3) {
-            level.sendParticles(ParticleTypes.ENCHANTED_HIT, this.getX(), this.getY() + this.getBbHeight(), this.getZ(),
-                    20, this.getBbWidth() * 0.3D, 0.3D, this.getBbWidth() * 0.3D, 0.1D);
-        }
-    }
-
-    @Override
-    protected boolean performSignature(ServerLevel level, @Nullable LivingEntity target, @Nullable Vec3 aimPoint, boolean ridden) {
-        if (RoyalEffectHooks.commandedHolder() == null) {
-            return false;
-        }
-        Vec3 center = this.position();
-        List<Mob> candidates = this.commandCandidates(center);
-        candidates.sort(Comparator.comparingDouble(mob -> mob.distanceToSqr(center)));
-        int applied = 0;
-        for (Mob mob : candidates) {
-            if (applied >= this.commandLimit()) {
-                break;
-            }
-            if (mob.addEffect(new MobEffectInstance(RoyalEffectHooks.commandedHolder(), 300 + 20 * Mth.floor(this.getGrowthScale())), this)) {
-                applied++;
-                level.sendParticles(COMMAND_DUST, mob.getX(), mob.getY() + mob.getBbHeight() + 0.3D, mob.getZ(), 8, 0.25D, 0.2D, 0.25D, 0.0D);
-            }
-        }
-        level.sendParticles(ParticleTypes.SONIC_BOOM, this.getX(), this.getY() + this.getBbHeight() * 0.6D, this.getZ(), 1, 0.0D, 0.0D, 0.0D, 0.0D);
-        return applied > 0;
-    }
-
     @Override
     protected String geoName() {
         return "prince";

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/PrincessEntity.java

@@ -4,18 +4,10 @@ import com.craisinlord.antarchy.config.AntarchySettings;
 import com.craisinlord.antarchy.content.AntarchyObjects;
 import com.craisinlord.antarchy.content.AntarchySoundEvents;
 import com.craisinlord.antarchy.content.entity.royal.beam.RoyalBeamElement;
-import com.craisinlord.anthology.time.TimeDilationApi;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.Nullable;
 
 public class PrincessEntity extends RoyalMountEntity {
     public PrincessEntity(EntityType<? extends PrincessEntity> entityType, Level level) {
@@ -32,120 +24,11 @@ public class PrincessEntity extends RoyalMountEntity {
 
     @Override
     protected RoyalBeamElement boltElement(int lateralIndex) {
-        return RoyalBeamElement.GENERIC;
-    }
-
-    @Override
-    protected Vec3 boltOrigin(int lateralIndex) {
-        float scale = this.getGrowthScale();
-        Vec3 forward = Vec3.directionFromRotation(0.0F, this.getYRot());
-        Vec3 side = new Vec3(-forward.z, 0.0D, forward.x);
-        return this.position()
-                .add(0.0D, (lateralIndex == 0 ? 0.4D : 0.33D) * scale, 0.0D)
-                .add(forward.scale((lateralIndex == 0 ? 0.32D : 0.23D) * scale + this.getBbWidth() * 0.15D))
-                .add(side.scale(lateralIndex * 0.24D * scale));
-    }
-
-    @Override
-    protected int nextBeamHead(int previous) {
-        return 1;
-    }
-
-    @Override
-    protected ParticleOptions beamWindupParticle() {
-        return ParticleTypes.REVERSE_PORTAL;
-    }
-
-    @Override
-    protected float beamBaseDamage() {
-        return 10.0F;
-    }
-
-    @Override
-    public boolean prefersAerialCombat() {
-        return this.canFly();
-    }
-
-    @Override
-    public double preferredCombatRange() {
-        return 8.0D + 1.5D * this.getGrowthScale();
-    }
-
-    @Override
-    protected float biteWeight() {
-        return 1.0F;
-    }
-
-    @Override
-    protected float spitWeight() {
-        return 2.5F;
-    }
-
-    @Override
-    protected float beamWeight() {
-        return 1.6F;
-    }
-
-    @Override
-    protected float signatureWeight() {
-        return 2.5F;
-    }
-
-    @Override
-    protected int signatureCooldownTicks() {
-        return 300;
-    }
-
-    private double fieldRadius() {
-        return 5.0D + 0.8D * this.getGrowthScale();
-    }
-
-    private boolean ownerInside(Vec3 center) {
-        LivingEntity owner = this.getOwner();
-        if (owner == null || owner.level() != this.level() || this.hasPassenger(owner)) {
-            return false;
-        }
-        double clearance = this.fieldRadius() + 1.5D;
-        return owner.position().distanceToSqr(center) < clearance * clearance;
-    }
-
-    @Override
-    protected boolean isSignatureUseful(LivingEntity target) {
-        return this.combatGap(target) < 10.0D + 1.5D * this.getGrowthScale() && !this.ownerInside(target.position());
-    }
-
-    private Vec3 fieldCenter(@Nullable LivingEntity target, @Nullable Vec3 aimPoint) {
-        if (target != null && target.isAlive()) {
-            return target.position();
-        }
-        return aimPoint != null ? aimPoint : this.position().add(Vec3.directionFromRotation(0.0F, this.getYRot()).scale(this.getBbWidth() + 6.0D));
-    }
-
-    @Override
-    protected void signatureTelegraph(ServerLevel level, int tick, @Nullable LivingEntity target, @Nullable Vec3 aimPoint) {
-        if (tick % 2 != 0) {
-            return;
-        }
-        Vec3 center = this.fieldCenter(target, aimPoint);
-        double radius = this.fieldRadius() * (1.0D - tick / 24.0D) + 0.5D;
-        for (int i = 0; i < 12; i++) {
-            double angle = i * Mth.TWO_PI / 12.0D - tick * 0.15D;
-            level.sendParticles(ParticleTypes.REVERSE_PORTAL, center.x + Math.cos(angle) * radius, center.y + 0.2D,
-                    center.z + Math.sin(angle) * radius, 1, 0.0D, 0.05D, 0.0D, 0.0D);
-        }
-        Vec3 orb = this.boltOrigin(0);
-        level.sendParticles(ParticleTypes.END_ROD, orb.x, orb.y, orb.z, 2, 0.1D, 0.1D, 0.1D, 0.01D);
-    }
-
-    @Override
-    protected boolean performSignature(ServerLevel level, @Nullable LivingEntity target, @Nullable Vec3 aimPoint, boolean ridden) {
-        Vec3 center = this.fieldCenter(target, aimPoint);
-        if (this.ownerInside(center)) {
-            return false;
-        }
-        TimeDilationApi.createField(level, center, this.fieldRadius(), 0.35D, 100 + 10 * Mth.floor(this.getGrowthScale()), this.getUUID());
-        level.sendParticles(ParticleTypes.END_ROD, center.x, center.y + 0.5D, center.z, 36, this.fieldRadius() * 0.3D, 0.6D, this.fieldRadius() * 0.3D, 0.03D);
-        return true;
+        return switch (lateralIndex) {
+            case -1 -> RoyalBeamElement.FIRE;
+            case 1 -> RoyalBeamElement.ICE;
+            default -> RoyalBeamElement.LIGHTNING;
+        };
     }
 
     @Override

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalBoltEntity.java

@@ -86,14 +86,6 @@ public class RoyalBoltEntity extends AbstractHurtingProjectile {
         };
     }
 
-    @Override
-    protected boolean canHitEntity(Entity target) {
-        if (this.getOwner() instanceof RoyalMountEntity mount && mount.isFriendlyTo(target)) {
-            return false;
-        }
-        return super.canHitEntity(target);
-    }
-
     @Override
     protected void onHitEntity(EntityHitResult result) {
         super.onHitEntity(result);
@@ -109,13 +101,7 @@ public class RoyalBoltEntity extends AbstractHurtingProjectile {
                 && royal.isTame() && other.isTame()) {
             return;
         }
-        if (owner instanceof RoyalMountEntity mount && mount.isFriendlyTo(target)) {
-            return;
-        }
         float damage = (float) AntarchySettings.royalBoltDamage();
-        if (owner instanceof RoyalMountEntity mount) {
-            damage *= mount.projectileDamageMultiplier();
-        }
         target.hurt(this.damageSources().mobProjectile(this, owner instanceof LivingEntity le ? le : null), damage);
         if (target instanceof LivingEntity living) {
             living.knockback(0.35D, this.getX() - target.getX(), this.getZ() - target.getZ());
@@ -139,9 +125,6 @@ public class RoyalBoltEntity extends AbstractHurtingProjectile {
                     }
                 }
                 case GENERIC -> {
-                    if (owner instanceof PrincessEntity) {
-                        living.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 60, 1), owner);
-                    }
                 }
             }
         }

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalBossEntity.java

@@ -2006,8 +2006,7 @@ public abstract class RoyalBossEntity extends Monster implements GeoEntity, Mult
         if (source.is(DamageTypes.GENERIC_KILL)) {
             return super.hurt(source, amount);
         }
-        float cap = (float) AntarchySettings.royalBossMaxSingleHitDamage();
-        float cappedAmount = amount <= cap ? amount : cap + (amount - cap) * (float) AntarchySettings.royalBossHitOverflowRate();
+        float cappedAmount = (float) Math.min(amount, AntarchySettings.royalBossMaxSingleHitDamage());
         return super.hurt(source, cappedAmount);
     }
 

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalMountCombatGoal.java

@@ -1,239 +0,0 @@
-package com.craisinlord.antarchy.content.entity.royal;
-
-import java.util.EnumSet;
-import net.minecraft.util.Mth;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.phys.Vec3;
-
-public class RoyalMountCombatGoal extends Goal {
-    private static final int FLIGHT_DECISION_INTERVAL = 40;
-
-    private final RoyalMountEntity mount;
-    private LivingEntity target;
-    private int repathTicks;
-    private int flightDecisionTicks;
-    private boolean wantsFlight;
-    private int stuckTicks;
-    private Vec3 lastCheckPosition = Vec3.ZERO;
-    private float orbitAngle;
-    private int orbitDirection = 1;
-    private int diveTicks;
-    private int unseenTicks;
-
-    public RoyalMountCombatGoal(RoyalMountEntity mount) {
-        this.mount = mount;
-        this.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
-    }
-
-    @Override
-    public boolean canUse() {
-        LivingEntity candidate = this.mount.getTarget();
-        if (!this.isValid(candidate)) {
-            return false;
-        }
-        this.target = candidate;
-        return true;
-    }
-
-    @Override
-    public boolean canContinueToUse() {
-        LivingEntity current = this.mount.getTarget();
-        if (current != this.target || !this.isValid(current)) {
-            return false;
-        }
-        double range = this.mount.getAttributeValue(net.minecraft.world.entity.ai.attributes.Attributes.FOLLOW_RANGE) * 1.2D;
-        return this.mount.distanceToSqr(current) < range * range && this.unseenTicks < 200;
-    }
-
-    private boolean isValid(LivingEntity candidate) {
-        return candidate != null && candidate.isAlive() && !this.mount.isVehicle() && !this.mount.isOrderedToSit()
-                && candidate.level() == this.mount.level() && this.mount.canAttack(candidate);
-    }
-
-    @Override
-    public void start() {
-        this.repathTicks = 0;
-        this.flightDecisionTicks = 0;
-        this.wantsFlight = false;
-        this.stuckTicks = 0;
-        this.unseenTicks = 0;
-        this.diveTicks = 0;
-        this.lastCheckPosition = this.mount.position();
-        Vec3 offset = this.mount.position().subtract(this.target.position());
-        this.orbitAngle = (float) Mth.atan2(offset.z, offset.x);
-        this.orbitDirection = this.mount.getRandom().nextBoolean() ? 1 : -1;
-    }
-
-    @Override
-    public void stop() {
-        this.target = null;
-        this.mount.getNavigation().stop();
-    }
-
-    @Override
-    public boolean requiresUpdateEveryTick() {
-        return true;
-    }
-
-    @Override
-    public void tick() {
-        LivingEntity current = this.target;
-        if (current == null) {
-            return;
-        }
-        boolean canSee = this.mount.getSensing().hasLineOfSight(current);
-        this.unseenTicks = canSee ? 0 : this.unseenTicks + 1;
-        double gap = this.mount.combatGap(current);
-        this.mount.getLookControl().setLookAt(current, 30.0F, 30.0F);
-        this.trackStuck();
-        this.updateFlightDecision(current, gap);
-
-        if (this.mount.isActing()) {
-            this.holdDuringAction(current);
-            return;
-        }
-
-        int chosen = this.mount.chooseCombatAction(current, gap, canSee);
-        if (chosen != RoyalMountEntity.ACTION_NONE && this.isFacing(current, this.facingTolerance(chosen))) {
-            if (this.mount.startAction(chosen, current, current.getEyePosition(), false)) {
-                this.diveTicks = 0;
-                this.holdDuringAction(current);
-                return;
-            }
-        }
-        if (chosen != RoyalMountEntity.ACTION_NONE) {
-            this.mount.turnTowards(current.position(), 18.0F);
-        }
-
-        if (this.mount.isFlying()) {
-            this.tickAerial(current, gap);
-        } else {
-            this.tickGround(current, gap, canSee);
-        }
-    }
-
-    private float facingTolerance(int action) {
-        return switch (action) {
-            case RoyalMountEntity.ACTION_BITE -> 50.0F;
-            case RoyalMountEntity.ACTION_SIGNATURE -> 180.0F;
-            default -> 120.0F;
-        };
-    }
-
-    private boolean isFacing(LivingEntity current, float tolerance) {
-        Vec3 toTarget = current.position().subtract(this.mount.position());
-        float desired = (float) (Mth.atan2(toTarget.z, toTarget.x) * Mth.RAD_TO_DEG) - 90.0F;
-        return Math.abs(Mth.wrapDegrees(desired - this.mount.getYRot())) <= tolerance;
-    }
-
-    private void holdDuringAction(LivingEntity current) {
-        this.mount.getNavigation().stop();
-        if (this.mount.isFlying()) {
-            this.mount.claimFlight();
-            if (this.mount.currentAction() == RoyalMountEntity.ACTION_BITE) {
-                this.mount.getMoveControl().setWantedPosition(current.getX(), current.getY() + current.getBbHeight() * 0.5D, current.getZ(), 0.6D);
-            } else {
-                this.mount.getMoveControl().setWantedPosition(this.mount.getX(), this.mount.getY(), this.mount.getZ(), 0.4D);
-            }
-        } else if (this.mount.currentAction() != RoyalMountEntity.ACTION_BITE) {
-            this.mount.setDeltaMovement(this.mount.getDeltaMovement().multiply(0.5D, 1.0D, 0.5D));
-        }
-    }
-
-    private void trackStuck() {
-        if (this.mount.tickCount % 20 != 0) {
-            return;
-        }
-        Vec3 position = this.mount.position();
-        boolean trying = !this.mount.getNavigation().isDone() || this.mount.isFlying();
-        if (trying && position.distanceToSqr(this.lastCheckPosition) < 1.0D) {
-            this.stuckTicks += 20;
-        } else {
-            this.stuckTicks = 0;
-        }
-        this.lastCheckPosition = position;
-    }
-
-    private void updateFlightDecision(LivingEntity current, double gap) {
-        if (!this.mount.canFly()) {
-            this.wantsFlight = false;
-            return;
-        }
-        if (--this.flightDecisionTicks <= 0 || this.stuckTicks >= 40) {
-            this.flightDecisionTicks = FLIGHT_DECISION_INTERVAL;
-            boolean targetAbove = current.getY() - this.mount.getY() > 4.0D + this.mount.getBbHeight() * 0.25D;
-            boolean targetAirborne = !current.onGround() && !current.isInWater() && RoyalMountEntity.isAirborne(current) || targetAbove;
-            boolean groundBlocked = !this.mount.isFlying() && (this.stuckTicks >= 40
-                    || this.mount.getNavigation().isDone() && gap > 4.0D && this.mount.getNavigation().createPath(current, 0) == null);
-            boolean prefersAir = this.mount.prefersAerialCombat() && gap > 3.0D;
-            this.wantsFlight = targetAirborne || groundBlocked || prefersAir || (this.mount.isFlying() && this.diveTicks > 0);
-            if (this.stuckTicks >= 40) {
-                this.stuckTicks = 0;
-            }
-        }
-        if (this.wantsFlight) {
-            this.mount.claimFlight();
-        }
-    }
-
-    private void tickAerial(LivingEntity current, double gap) {
-        if (!this.wantsFlight) {
-            return;
-        }
-        this.mount.claimFlight();
-        float scale = this.mount.getGrowthScale();
-        boolean wantsBite = this.mount.isActionAvailable(RoyalMountEntity.ACTION_BITE)
-                && (!this.mount.prefersAerialCombat() || gap < this.mount.preferredCombatRange() * 0.5D || this.diveTicks > 0);
-        if (wantsBite && this.mount.isActionReady()) {
-            this.diveTicks++;
-            Vec3 approach = current.position().subtract(this.mount.position()).multiply(1.0D, 0.0D, 1.0D);
-            Vec3 offset = approach.lengthSqr() > 1.0E-4D ? approach.normalize().scale(-(this.mount.getBbWidth() * 0.5D + 0.6D * scale)) : Vec3.ZERO;
-            this.mount.getMoveControl().setWantedPosition(current.getX() + offset.x, current.getY() + 0.2D, current.getZ() + offset.z, 1.4D);
-            if (this.diveTicks > 80) {
-                this.diveTicks = 0;
-                this.orbitDirection = -this.orbitDirection;
-            }
-            return;
-        }
-        this.diveTicks = 0;
-        double radius = Math.max(6.0D + 1.5D * scale, this.mount.preferredCombatRange()) + this.mount.getBbWidth() * 0.5D;
-        this.orbitAngle += this.orbitDirection * (float) Math.min(0.08D, 1.2D / radius);
-        double x = current.getX() + Math.cos(this.orbitAngle) * radius;
-        double z = current.getZ() + Math.sin(this.orbitAngle) * radius;
-        double y = current.getY() + 3.0D + 0.8D * scale;
-        if (!this.mount.canOccupy(x, y, z)) {
-            this.orbitDirection = -this.orbitDirection;
-            y += 2.0D + scale;
-        }
-        this.mount.getMoveControl().setWantedPosition(x, y, z, 1.1D);
-    }
-
-    private void tickGround(LivingEntity current, double gap, boolean canSee) {
-        double preferred = this.mount.preferredCombatRange();
-        boolean ranged = preferred > 0.0D && this.mount.canSpit();
-        if (ranged && canSee && gap < preferred * 0.5D && !this.mount.isActionAvailable(RoyalMountEntity.ACTION_BITE)) {
-            Vec3 away = this.mount.position().subtract(current.position()).multiply(1.0D, 0.0D, 1.0D);
-            if (away.lengthSqr() > 1.0E-4D && --this.repathTicks <= 0) {
-                this.repathTicks = 10;
-                Vec3 destination = this.mount.position().add(away.normalize().scale(4.0D + this.mount.getBbWidth() * 0.5D));
-                this.mount.getNavigation().moveTo(destination.x, destination.y, destination.z, 1.2D);
-            }
-            return;
-        }
-        if (ranged && canSee && gap <= preferred && gap >= preferred * 0.5D && !this.mount.isActionAvailable(RoyalMountEntity.ACTION_BITE)) {
-            this.mount.getNavigation().stop();
-            this.mount.turnTowards(current.position(), 12.0F);
-            return;
-        }
-        if (this.mount.canBiteReach(current)) {
-            this.mount.getNavigation().stop();
-            this.mount.turnTowards(current.position(), 18.0F);
-            return;
-        }
-        if (--this.repathTicks <= 0) {
-            this.repathTicks = 6 + this.mount.getRandom().nextInt(6);
-            this.mount.getNavigation().moveTo(current, 1.2D);
-        }
-    }
-}

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalMountCompanionGoal.java

@@ -1,175 +0,0 @@
-package com.craisinlord.antarchy.content.entity.royal;
-
-import java.util.EnumSet;
-import net.minecraft.util.Mth;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.phys.Vec3;
-
-public class RoyalMountCompanionGoal extends Goal {
-    private static final double MAX_OWNER_DISTANCE = 40.0D;
-
-    private final RoyalMountEntity mount;
-    private LivingEntity owner;
-    private int side = 1;
-    private float orbitAngle;
-    private int repathTicks;
-    private int settledTicks;
-    private int cooldown;
-    private Vec3 spot;
-
-    public RoyalMountCompanionGoal(RoyalMountEntity mount) {
-        this.mount = mount;
-        this.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
-    }
-
-    private boolean isEligible(LivingEntity candidate) {
-        return candidate != null && candidate.isAlive() && !candidate.isSpectator()
-                && candidate.level() == this.mount.level()
-                && this.mount.isTame() && !this.mount.isVehicle() && !this.mount.isOrderedToSit()
-                && !this.mount.isLeashed() && this.mount.getTarget() == null && !this.mount.isActing()
-                && this.mount.distanceToSqr(candidate) < MAX_OWNER_DISTANCE * MAX_OWNER_DISTANCE;
-    }
-
-    private double settleDistance() {
-        return 4.0D + this.mount.getBbWidth() * 0.6D;
-    }
-
-    private boolean needsToReposition(LivingEntity candidate) {
-        if (this.mount.canFly() && RoyalMountEntity.isAirborne(candidate)) {
-            return true;
-        }
-        if (this.mount.isFlying()) {
-            return true;
-        }
-        double settle = this.settleDistance() + 2.0D;
-        return this.mount.distanceToSqr(candidate) > settle * settle;
-    }
-
-    @Override
-    public boolean canUse() {
-        if (this.cooldown > 0) {
-            this.cooldown--;
-            return false;
-        }
-        LivingEntity candidate = this.mount.getOwner();
-        if (!this.isEligible(candidate) || !this.needsToReposition(candidate)) {
-            return false;
-        }
-        this.owner = candidate;
-        return true;
-    }
-
-    @Override
-    public boolean canContinueToUse() {
-        return this.isEligible(this.owner) && this.owner == this.mount.getOwner() && this.settledTicks < 40;
-    }
-
-    @Override
-    public void start() {
-        this.side = this.mount.getRandom().nextBoolean() ? 1 : -1;
-        this.repathTicks = 0;
-        this.settledTicks = 0;
-        this.spot = null;
-        Vec3 offset = this.mount.position().subtract(this.owner.position());
-        this.orbitAngle = (float) Mth.atan2(offset.z, offset.x);
-    }
-
-    @Override
-    public void stop() {
-        this.owner = null;
-        this.spot = null;
-        this.cooldown = 20;
-        this.mount.getNavigation().stop();
-    }
-
-    @Override
-    public boolean requiresUpdateEveryTick() {
-        return true;
-    }
-
-    @Override
-    public void tick() {
-        float scale = this.mount.getGrowthScale();
-        if (this.mount.canFly() && RoyalMountEntity.isAirborne(this.owner)) {
-            this.settledTicks = 0;
-            this.spot = null;
-            this.mount.claimFlight();
-            this.circleOwner(scale);
-            return;
-        }
-
-        if (--this.repathTicks <= 0 || this.spot == null) {
-            this.repathTicks = 20;
-            this.spot = this.pickSpotBesideOwner();
-        }
-
-        if (this.mount.isFlying()) {
-            this.settledTicks = 0;
-            this.mount.getLookControl().setLookAt(this.owner, 10.0F, this.mount.getMaxHeadXRot());
-            if (this.mount.onGround() || this.mount.isInWater()) {
-                this.mount.setFlying(false);
-                return;
-            }
-            this.mount.claimFlight();
-            Vec3 target = this.spot != null ? this.spot : this.owner.position();
-            double horizontal = Math.sqrt(Mth.square(target.x - this.mount.getX()) + Mth.square(target.z - this.mount.getZ()));
-            double y = horizontal > 3.0D + scale ? Math.max(target.y + 1.5D * scale, this.mount.getY() - 2.0D) : target.y - 0.5D;
-            this.mount.getMoveControl().setWantedPosition(target.x, y, target.z, 1.0D);
-            return;
-        }
-
-        double settle = this.settleDistance();
-        boolean nearOwner = this.mount.distanceToSqr(this.owner) <= settle * settle;
-        boolean nearSpot = this.spot != null && this.mount.position().distanceToSqr(this.spot) <= Mth.square(1.5D + 0.5D * scale);
-        if (nearOwner || nearSpot) {
-            this.mount.getNavigation().stop();
-            if (this.settledTicks == 0) {
-                this.mount.turnTowards(this.mount.position().add(this.owner.getLookAngle().multiply(1.0D, 0.0D, 1.0D)), 30.0F);
-                if (this.mount.getRandom().nextInt(4) == 0) {
-                    this.mount.triggerQuirk();
-                }
-            }
-            this.mount.getLookControl().setLookAt(this.owner, 10.0F, this.mount.getMaxHeadXRot());
-            this.settledTicks++;
-            return;
-        }
-        this.settledTicks = 0;
-        this.mount.getLookControl().setLookAt(this.owner, 10.0F, this.mount.getMaxHeadXRot());
-        if (this.repathTicks == 20) {
-            Vec3 destination = this.spot != null ? this.spot : this.owner.position();
-            if (!this.mount.getNavigation().moveTo(destination.x, destination.y, destination.z, 1.0D)) {
-                this.mount.getNavigation().moveTo(this.owner, 1.0D);
-            }
-        }
-    }
-
-    private void circleOwner(float scale) {
-        double radius = 5.0D + this.mount.getBbWidth() * 0.75D;
-        this.orbitAngle += this.side * (float) Math.min(0.07D, 1.0D / radius);
-        double x = this.owner.getX() + Math.cos(this.orbitAngle) * radius;
-        double z = this.owner.getZ() + Math.sin(this.orbitAngle) * radius;
-        double y = this.owner.getY() + 2.0D + 0.6D * scale;
-        if (!this.mount.canOccupy(x, y, z)) {
-            y += 2.0D + scale;
-        }
-        this.mount.getMoveControl().setWantedPosition(x, y, z, 1.2D);
-        this.mount.getLookControl().setLookAt(this.owner, 10.0F, this.mount.getMaxHeadXRot());
-    }
-
-    private Vec3 pickSpotBesideOwner() {
-        Vec3 facing = Vec3.directionFromRotation(0.0F, this.owner.getYRot());
-        Vec3 right = new Vec3(-facing.z, 0.0D, facing.x);
-        double distance = this.mount.getBbWidth() * 0.5D + 1.5D;
-        for (int attempt = 0; attempt < 2; attempt++) {
-            int currentSide = attempt == 0 ? this.side : -this.side;
-            Vec3 base = this.owner.position().add(right.scale(currentSide * distance));
-            double ground = this.mount.findGroundY(base.x, this.owner.getY() + 3.0D, base.z, 10);
-            if (!Double.isNaN(ground) && this.mount.canOccupy(base.x, ground, base.z)) {
-                this.side = currentSide;
-                return new Vec3(base.x, ground, base.z);
-            }
-        }
-        return null;
-    }
-}

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalMountFollowOwnerGoal.java

@@ -1,76 +1,81 @@
 package com.craisinlord.antarchy.content.entity.royal;
 
-import java.util.EnumSet;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.phys.Vec3;
 
 public class RoyalMountFollowOwnerGoal extends Goal {
+    private static final double START_DISTANCE = 12.0D;
+    private static final double STOP_DISTANCE = 6.0D;
+    private static final double TELEPORT_DISTANCE = 48.0D;
+
     private final RoyalMountEntity mount;
     private LivingEntity owner;
     private int recalcTimer;
-    private int stuckTicks;
-    private int teleportCooldown;
-    private Vec3 lastCheckPosition = Vec3.ZERO;
 
     public RoyalMountFollowOwnerGoal(RoyalMountEntity mount) {
         this.mount = mount;
-        this.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
-    }
-
-    private double startDistance() {
-        return 14.0D + 2.0D * this.mount.getGrowthScale();
-    }
-
-    private double stopDistance() {
-        return 6.0D + 1.5D * this.mount.getGrowthScale();
-    }
-
-    private double teleportDistance() {
-        return 48.0D + 4.0D * this.mount.getGrowthScale();
-    }
-
-    private boolean canFollow(LivingEntity candidate) {
-        return candidate != null && candidate.isAlive() && !candidate.isSpectator()
-                && candidate.level() == this.mount.level()
-                && this.mount.isTame() && !this.mount.isVehicle() && !this.mount.isOrderedToSit()
-                && !this.mount.isLeashed() && this.mount.getTarget() == null;
     }
 
     @Override
     public boolean canUse() {
-        LivingEntity candidate = this.mount.getOwner();
-        if (!this.canFollow(candidate)) {
+        if (!this.mount.isTame() || this.mount.isVehicle() || this.mount.isOrderedToSit()) {
             return false;
         }
-        double start = this.startDistance();
-        if (this.mount.distanceToSqr(candidate) < start * start) {
+        LivingEntity potentialOwner = this.mount.getOwner();
+        if (potentialOwner == null || potentialOwner.isSpectator()) {
             return false;
         }
-        this.owner = candidate;
+        if (this.mount.distanceToSqr(potentialOwner) < START_DISTANCE * START_DISTANCE) {
+            return false;
+        }
+        this.owner = potentialOwner;
         return true;
     }
 
     @Override
     public boolean canContinueToUse() {
-        if (!this.canFollow(this.owner) || this.owner != this.mount.getOwner()) {
-            return false;
-        }
-        double stop = this.stopDistance();
-        return this.mount.distanceToSqr(this.owner) > stop * stop;
+        return !this.mount.getNavigation().isDone()
+                && this.mount.distanceToSqr(this.owner) > STOP_DISTANCE * STOP_DISTANCE
+                && !this.mount.isOrderedToSit();
     }
 
     @Override
     public void start() {
         this.recalcTimer = 0;
-        this.stuckTicks = 0;
-        this.lastCheckPosition = this.mount.position();
     }
 
     @Override
     public void stop() {
         this.owner = null;
         this.mount.getNavigation().stop();
+        this.mount.setFlying(false);
+    }
+
+    @Override
+    public void tick() {
+        this.mount.getLookControl().setLookAt(this.owner, 10.0F, this.mount.getMaxHeadXRot());
+
+        double distanceSqr = this.mount.distanceToSqr(this.owner);
+        if (distanceSqr > TELEPORT_DISTANCE * TELEPORT_DISTANCE) {
+            this.trySafeTeleport();
+            return;
+        }
+
+        boolean ownerAirborne = !this.owner.onGround() || (this.owner.getY() - this.mount.getY()) > 3.0D;
+        this.mount.setFlying(ownerAirborne || distanceSqr > 24.0D * 24.0D);
+
+        if (--this.recalcTimer <= 0) {
+            this.recalcTimer = 10;
+            if (this.mount.isFlying()) {
+                Vec3 to = this.owner.position().subtract(this.mount.position());
+                Vec3 step = this.mount.position().add(to.normalize().scale(Math.min(to.length(), 8.0D)));
+                this.mount.getMoveControl().setWantedPosition(step.x, step.y + 1.0D, step.z, 1.2D);
+            } else {
+                this.mount.getNavigation().moveTo(this.owner, 1.1D);
+            }
+        }
     }
 
     @Override
@@ -78,57 +83,28 @@ public class RoyalMountFollowOwnerGoal extends Goal {
         return true;
     }
 
-    @Override
-    public void tick() {
-        this.mount.getLookControl().setLookAt(this.owner, 10.0F, this.mount.getMaxHeadXRot());
-        if (this.teleportCooldown > 0) {
-            this.teleportCooldown--;
+    private void trySafeTeleport() {
+        Vec3 ownerPosition = this.owner.position();
+        BlockPos ownerBlock = this.owner.blockPosition();
+        for (int radius = 0; radius <= 2; radius++) {
+            for (int dx = -radius; dx <= radius; dx++) {
+                for (int dz = -radius; dz <= radius; dz++) {
+                    for (int dy = -1; dy <= 2; dy++) {
+                        double x = ownerPosition.x + dx + 0.5D;
+                        double y = ownerBlock.getY() + dy;
+                        double z = ownerPosition.z + dz + 0.5D;
+                        BlockPos floor = BlockPos.containing(x, y - 0.1D, z);
+                        var destination = this.mount.getBoundingBox().move(x - this.mount.getX(), y - this.mount.getY(), z - this.mount.getZ());
+                        if (!this.mount.level().noCollision(this.mount, destination)) {
+                            continue;
                         }
-        this.trackStuck();
-
-        double distance = this.mount.distanceTo(this.owner);
-        if ((distance > this.teleportDistance() || this.stuckTicks >= 100 && distance > 24.0D) && this.teleportCooldown <= 0) {
-            this.teleportCooldown = 20;
-            if (this.mount.tryTeleportNear(this.owner)) {
-                this.stuckTicks = 0;
+                        if (this.mount.isFlying() || !this.mount.level().getBlockState(floor).getCollisionShape(this.mount.level(), floor).isEmpty()) {
+                            this.mount.teleportTo(x, y, z);
                             return;
                         }
                     }
-
-        boolean ownerAirborne = RoyalMountEntity.isAirborne(this.owner);
-        boolean wantsFlight = this.mount.canFly() && (ownerAirborne || distance > 24.0D + this.mount.getBbWidth()
-                || this.stuckTicks >= 40 || this.owner.getY() - this.mount.getY() > 4.0D);
-        if (wantsFlight && this.mount.claimFlight()) {
-            if (--this.recalcTimer <= 0) {
-                this.recalcTimer = 5;
-                float scale = this.mount.getGrowthScale();
-                Vec3 destination = this.owner.position().add(0.0D, 2.0D + 0.6D * scale, 0.0D);
-                Vec3 to = destination.subtract(this.mount.position());
-                double stepLength = Math.min(to.length(), 12.0D + 2.0D * scale);
-                Vec3 step = to.lengthSqr() > 1.0E-4D ? this.mount.position().add(to.normalize().scale(stepLength)) : destination;
-                this.mount.getMoveControl().setWantedPosition(step.x, step.y, step.z, 1.3D);
-            }
-            return;
-        }
-        if (this.mount.isFlying()) {
-            return;
-        }
-        if (--this.recalcTimer <= 0) {
-            this.recalcTimer = 10;
-            this.mount.getNavigation().moveTo(this.owner, 1.2D);
                 }
             }
-
-    private void trackStuck() {
-        if (this.mount.tickCount % 20 != 0) {
-            return;
         }
-        Vec3 position = this.mount.position();
-        if (position.distanceToSqr(this.lastCheckPosition) < 1.0D) {
-            this.stuckTicks += 20;
-        } else {
-            this.stuckTicks = 0;
-        }
-        this.lastCheckPosition = position;
     }
 }

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalMountSpitGoal.java

@@ -0,0 +1,49 @@
+package com.craisinlord.antarchy.content.entity.royal;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.goal.Goal;
+
+public class RoyalMountSpitGoal extends Goal {
+    private final RoyalMountEntity mount;
+    private int cooldown;
+
+    public RoyalMountSpitGoal(RoyalMountEntity mount) {
+        this.mount = mount;
+    }
+
+    @Override
+    public boolean canUse() {
+        if (this.mount.isVehicle() || this.mount.isOrderedToSit()) {
+            return false;
+        }
+        LivingEntity target = this.mount.getTarget();
+        if (target == null || !target.isAlive() || !this.mount.canAttack(target)) {
+            return false;
+        }
+        double distance = this.mount.distanceTo(target);
+        return distance > 5.0D && distance < 20.0D && this.mount.hasLineOfSight(target);
+    }
+
+    @Override
+    public void start() {
+        this.cooldown = 20;
+    }
+
+    @Override
+    public void tick() {
+        LivingEntity target = this.mount.getTarget();
+        if (target == null || !this.mount.canAttack(target)) {
+            return;
+        }
+        this.mount.getLookControl().setLookAt(target, 30.0F, 30.0F);
+        if (this.cooldown-- <= 0) {
+            this.mount.startSpitVolley(target);
+            this.cooldown = 60;
+        }
+    }
+
+    @Override
+    public boolean requiresUpdateEveryTick() {
+        return true;
+    }
+}

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/AttitudeAdjusterItem.java

@@ -29,14 +29,6 @@ public class AttitudeAdjusterItem extends SwordItem {
         this.tier = tier;
     }
 
-    @Override
-    public com.google.common.collect.Multimap<net.minecraft.world.entity.ai.attributes.Attribute, net.minecraft.world.entity.ai.attributes.AttributeModifier> getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot slot) {
-        if (slot != net.minecraft.world.entity.EquipmentSlot.MAINHAND) {
-            return super.getDefaultAttributeModifiers(slot);
-        }
-        return com.craisinlord.antarchy.compat.item.WeaponAttributes.base(this.tier, (float) Math.round(AntarchySettings.attitudeAdjusterBaseDamage()), ATTACK_SPEED).build();
-    }
-
     @Override
     public void appendHoverText(ItemStack stack, Level level, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         tooltipComponents.add(Component.translatable("tooltip.antarchy.attitude_adjuster.grounded").withStyle(ChatFormatting.DARK_GRAY));

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/BasiliskDaggerItem.java

@@ -21,14 +21,6 @@ public class BasiliskDaggerItem extends SwordItem {
         this.attackSpeed = attackSpeed;
     }
 
-    @Override
-    public com.google.common.collect.Multimap<net.minecraft.world.entity.ai.attributes.Attribute, net.minecraft.world.entity.ai.attributes.AttributeModifier> getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot slot) {
-        if (slot != net.minecraft.world.entity.EquipmentSlot.MAINHAND) {
-            return super.getDefaultAttributeModifiers(slot);
-        }
-        return com.craisinlord.antarchy.compat.item.WeaponAttributes.base(this.tier, (float) Math.round(AntarchySettings.basiliskDaggerAttackDamage()), (float) AntarchySettings.basiliskDaggerAttackSpeed()).build();
-    }
-
     @Override
     public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity attacker) {
         boolean didHurt = super.hurtEnemy(stack, target, attacker);

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/BattleAxeItem.java

@@ -2,23 +2,13 @@ package com.craisinlord.antarchy.content.item;
 
 import com.craisinlord.antarchy.config.AntarchySettings;
 import com.craisinlord.antarchy.content.client.model.ResourceBackedGeoItemModel;
-import com.craisinlord.antarchy.content.item.ultimate.UltimateToolHelper;
-import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.DoubleSupplier;
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.AxeItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Tier;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
 import software.bernie.geckolib.animatable.GeoItem;
 import com.craisinlord.antarchy.content.client.AntarchyGeoItemRenderer;
 import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache;
@@ -44,33 +34,6 @@ public class BattleAxeItem extends AxeItem implements GeoItem, com.craisinlord.a
         GeoItem.registerSyncedAnimatable(this);
     }
 
-    @Override
-    public com.google.common.collect.Multimap<net.minecraft.world.entity.ai.attributes.Attribute, net.minecraft.world.entity.ai.attributes.AttributeModifier> getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot slot) {
-        if (slot != net.minecraft.world.entity.EquipmentSlot.MAINHAND) {
-            return super.getDefaultAttributeModifiers(slot);
-        }
-        return com.craisinlord.antarchy.compat.item.WeaponAttributes.base(this.tier, (float) this.attackDamage.getAsDouble(), (float) AntarchySettings.battleAxeAttackSpeed()).build();
-    }
-
-    @Override
-    public void appendHoverText(ItemStack stack, Level level, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
-        super.appendHoverText(stack, level, tooltipComponents, tooltipFlag);
-        if (AntarchySettings.ultimateToolsVeinMiningEnabled()) {
-            tooltipComponents.add(Component.translatable("tooltip.antarchy.battle_axe_tree_felling").withStyle(ChatFormatting.GRAY));
-        }
-    }
-
-    @Override
-    public boolean mineBlock(ItemStack stack, Level level, BlockState state, BlockPos pos, LivingEntity miningEntity) {
-        boolean result = super.mineBlock(stack, level, state, pos, miningEntity);
-        if (AntarchySettings.ultimateToolsVeinMiningEnabled()
-                && miningEntity instanceof ServerPlayer player
-                && !player.isShiftKeyDown()) {
-            UltimateToolHelper.mineTree(stack, level, state, pos, player, AntarchySettings.ultimateToolsTreeFellingMaxLogs());
-        }
-        return result;
-    }
-
     @Override
     public boolean isEnchantable(ItemStack stack) {
         return stack.getCount() == 1;

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimateAxeItem.java

@@ -31,18 +31,10 @@ public class UltimateAxeItem extends AxeItem {
         this.attackSpeed = attackSpeed;
     }
 
-    @Override
-    public com.google.common.collect.Multimap<net.minecraft.world.entity.ai.attributes.Attribute, net.minecraft.world.entity.ai.attributes.AttributeModifier> getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot slot) {
-        if (slot != net.minecraft.world.entity.EquipmentSlot.MAINHAND) {
-            return super.getDefaultAttributeModifiers(slot);
-        }
-        return com.craisinlord.antarchy.compat.item.WeaponAttributes.base(this.tier, (float) this.attackDamage.getAsDouble(), (float) AntarchySettings.ultimateAxeAttackSpeed()).build();
-    }
-
     @Override
     public void appendHoverText(ItemStack stack, Level level, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, level, tooltipComponents, tooltipFlag);
-        UltimateToolHelper.appendModeTooltip(UltimateToolHelper.ToolKind.AXE, tooltipComponents);
+        UltimateToolHelper.appendThreeByThreeTooltip(tooltipComponents);
     }
 
     @Override

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimateHoeItem.java

@@ -31,18 +31,10 @@ public class UltimateHoeItem extends HoeItem {
         this.attackSpeed = attackSpeed;
     }
 
-    @Override
-    public com.google.common.collect.Multimap<net.minecraft.world.entity.ai.attributes.Attribute, net.minecraft.world.entity.ai.attributes.AttributeModifier> getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot slot) {
-        if (slot != net.minecraft.world.entity.EquipmentSlot.MAINHAND) {
-            return super.getDefaultAttributeModifiers(slot);
-        }
-        return com.craisinlord.antarchy.compat.item.WeaponAttributes.base(this.tier, (float) Math.round(this.attackDamage.getAsDouble()), (float) AntarchySettings.ultimateHoeAttackSpeed()).build();
-    }
-
     @Override
     public void appendHoverText(ItemStack stack, Level level, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, level, tooltipComponents, tooltipFlag);
-        UltimateToolHelper.appendModeTooltip(UltimateToolHelper.ToolKind.HOE, tooltipComponents);
+        UltimateToolHelper.appendThreeByThreeTooltip(tooltipComponents);
     }
 
     @Override

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimatePickaxeItem.java

@@ -31,18 +31,10 @@ public class UltimatePickaxeItem extends PickaxeItem {
         this.attackSpeed = attackSpeed;
     }
 
-    @Override
-    public com.google.common.collect.Multimap<net.minecraft.world.entity.ai.attributes.Attribute, net.minecraft.world.entity.ai.attributes.AttributeModifier> getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot slot) {
-        if (slot != net.minecraft.world.entity.EquipmentSlot.MAINHAND) {
-            return super.getDefaultAttributeModifiers(slot);
-        }
-        return com.craisinlord.antarchy.compat.item.WeaponAttributes.base(this.tier, (float) Math.round(this.attackDamage.getAsDouble()), (float) AntarchySettings.ultimatePickaxeAttackSpeed()).build();
-    }
-
     @Override
     public void appendHoverText(ItemStack stack, Level level, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, level, tooltipComponents, tooltipFlag);
-        UltimateToolHelper.appendModeTooltip(UltimateToolHelper.ToolKind.PICKAXE, tooltipComponents);
+        UltimateToolHelper.appendThreeByThreeTooltip(tooltipComponents);
     }
 
     @Override

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimateSwordItem.java

@@ -19,14 +19,6 @@ public class UltimateSwordItem extends SwordItem {
         this.attackSpeed = attackSpeed;
     }
 
-    @Override
-    public com.google.common.collect.Multimap<net.minecraft.world.entity.ai.attributes.Attribute, net.minecraft.world.entity.ai.attributes.AttributeModifier> getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot slot) {
-        if (slot != net.minecraft.world.entity.EquipmentSlot.MAINHAND) {
-            return super.getDefaultAttributeModifiers(slot);
-        }
-        return com.craisinlord.antarchy.compat.item.WeaponAttributes.base(this.tier, (float) Math.round(this.attackDamage.getAsDouble()), (float) AntarchySettings.ultimateSwordAttackSpeed()).build();
-    }
-
     @Override
     public boolean isEnchantable(ItemStack stack) {
         return stack.getCount() == 1;

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimateToolHelper.java

@@ -3,16 +3,12 @@ package com.craisinlord.antarchy.content.item.ultimate;
 import com.craisinlord.antarchy.config.AntarchySettings;
 import com.craisinlord.antarchy.content.item.GiantFryingPanItem;
 import com.craisinlord.antarchy.content.item.GiantFryingPanToolHelper;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.function.Function;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -27,16 +23,12 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Tier;
 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.state.BlockState;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 
 public final class UltimateToolHelper {
     private static final String THREE_BY_THREE_TAG = "antarchy.ultimate_three_by_three";
-    private static final String MINING_MODE_TAG = "antarchy.ultimate_mining_mode";
     private static final ThreadLocal<Boolean> BREAKING_EXTRA_BLOCKS = ThreadLocal.withInitial(() -> false);
     private static final float GENERAL_MINING_MULTIPLIER = 1.1F;
     private static final float ULTIMATE_SHOVEL_MINING_SPEED = 24.0F;
@@ -46,43 +38,26 @@ public final class UltimateToolHelper {
 
     public static InteractionResultHolder<ItemStack> handleToggleUse(Level level, Player player, InteractionHand hand) {
         ItemStack stack = player.getItemInHand(hand);
-        if (!player.isShiftKeyDown() || availableModes(toolKindOf(stack.getItem())).size() < 2) {
+        if (!AntarchySettings.ultimateToolsThreeByThreeEnabled() || !player.isShiftKeyDown()) {
             return InteractionResultHolder.pass(stack);
         }
 
-        cycleMiningMode(level, player, stack);
+        toggleThreeByThree(level, player, stack);
         return InteractionResultHolder.sidedSuccess(stack, level.isClientSide);
     }
 
     public static InteractionResult handleToggleUseOn(UseOnContext context) {
         Player player = context.getPlayer();
-        if (player == null || !player.isShiftKeyDown() || availableModes(toolKindOf(context.getItemInHand().getItem())).size() < 2) {
+        if (!AntarchySettings.ultimateToolsThreeByThreeEnabled() || player == null || !player.isShiftKeyDown()) {
             return InteractionResult.PASS;
         }
 
-        cycleMiningMode(context.getLevel(), player, context.getItemInHand());
+        toggleThreeByThree(context.getLevel(), player, context.getItemInHand());
         return InteractionResult.sidedSuccess(context.getLevel().isClientSide);
     }
 
     public static boolean isThreeByThreeEnabled(ItemStack stack) {
-        return getMiningMode(stack) == MiningMode.THREE_BY_THREE;
-    }
-
-    public static boolean isVeinEnabled(ItemStack stack) {
-        return getMiningMode(stack) == MiningMode.VEIN;
-    }
-
-    public static MiningMode getMiningMode(ItemStack stack) {
-        CompoundTag tag = stack.getTag();
-        if (tag == null) {
-            return MiningMode.DEFAULT;
-        }
-        if (tag.contains(MINING_MODE_TAG)) {
-            int index = tag.getByte(MINING_MODE_TAG);
-            MiningMode[] modes = MiningMode.values();
-            return index >= 0 && index < modes.length ? modes[index] : MiningMode.DEFAULT;
-        }
-        return tag.getBoolean(THREE_BY_THREE_TAG) ? MiningMode.THREE_BY_THREE : MiningMode.DEFAULT;
+        return stack.hasTag() && stack.getTag().getBoolean(THREE_BY_THREE_TAG);
     }
 
     public static float getDestroySpeed(ToolKind toolKind, Tier tier, ItemStack stack, BlockState state, float defaultSpeed) {
@@ -99,127 +74,23 @@ public final class UltimateToolHelper {
         return defaultSpeed * GENERAL_MINING_MULTIPLIER;
     }
 
-    public static void appendModeTooltip(ToolKind toolKind, List<Component> tooltip) {
-        List<MiningMode> modes = availableModes(toolKind);
-        boolean area = modes.contains(MiningMode.THREE_BY_THREE);
-        boolean vein = modes.contains(MiningMode.VEIN);
-        String key;
-        if (area && vein) {
-            key = "tooltip.antarchy.ultimate_tools_3x3_vein";
-        } else if (area) {
-            key = "tooltip.antarchy.ultimate_tools_3x3";
-        } else if (vein) {
-            key = "tooltip.antarchy.ultimate_tools_vein";
-        } else {
+    public static void appendThreeByThreeTooltip(List<Component> tooltip) {
+        if (!AntarchySettings.ultimateToolsThreeByThreeEnabled()) {
             return;
         }
-        tooltip.add(Component.translatable(key).withStyle(ChatFormatting.GRAY));
+        tooltip.add(Component.translatable("tooltip.antarchy.ultimate_tools_3x3").withStyle(ChatFormatting.GRAY));
     }
 
     public static void handleAreaMining(ToolKind toolKind, ItemStack stack, Level level, BlockState originState, BlockPos origin, LivingEntity entity) {
-        if (level.isClientSide
+        if (!AntarchySettings.ultimateToolsThreeByThreeEnabled()
+                || level.isClientSide
                 || BREAKING_EXTRA_BLOCKS.get()
+                || !isThreeByThreeEnabled(stack)
                 || !(entity instanceof ServerPlayer player)) {
             return;
         }
 
-        MiningMode mode = getMiningMode(stack);
-        if (mode == MiningMode.DEFAULT || !availableModes(toolKind).contains(mode)) {
-            return;
-        }
-        if (mode == MiningMode.THREE_BY_THREE) {
         mineArea(toolKind, stack, level, originState, origin, player, 1);
-        } else {
-            mineVein(toolKind, stack, level, originState, origin, player, veinLimit(originState));
-        }
-    }
-
-    public static int veinLimit(BlockState state) {
-        return state.is(BlockTags.LOGS)
-                ? AntarchySettings.ultimateToolsTreeFellingMaxLogs()
-                : AntarchySettings.ultimateToolsVeinMiningMaxBlocks();
-    }
-
-    public static void mineVein(ToolKind toolKind, ItemStack stack, Level level, BlockState originState, BlockPos origin, ServerPlayer player, int maxBlocks) {
-        if (level.isClientSide || BREAKING_EXTRA_BLOCKS.get() || maxBlocks <= 0 || !matchesToolKind(toolKind, originState)) {
-            return;
-        }
-
-        breakAll(toolKind, stack, level, player, collectConnected(level, origin, originState.getBlock(), maxBlocks, false));
-    }
-
-    public static void mineTree(ItemStack stack, Level level, BlockState originState, BlockPos origin, ServerPlayer player, int maxBlocks) {
-        if (level.isClientSide || BREAKING_EXTRA_BLOCKS.get() || maxBlocks <= 0 || !originState.is(BlockTags.LOGS)) {
-            return;
-        }
-
-        breakAll(ToolKind.AXE, stack, level, player, collectConnected(level, origin, originState.getBlock(), maxBlocks, true));
-    }
-
-    private static void breakAll(ToolKind toolKind, ItemStack stack, Level level, ServerPlayer player, List<BlockPos> targets) {
-        if (targets.isEmpty()) {
-            return;
-        }
-
-        BREAKING_EXTRA_BLOCKS.set(true);
-        try {
-            for (BlockPos targetPos : targets) {
-                if (!canBreak(toolKind, player, stack, level, targetPos, level.getBlockState(targetPos))) {
-                    continue;
-                }
-
-                player.gameMode.destroyBlock(targetPos);
-                if (stack.isEmpty()) {
-                    break;
-                }
-            }
-        } finally {
-            BREAKING_EXTRA_BLOCKS.set(false);
-        }
-    }
-
-    private static List<BlockPos> collectConnected(Level level, BlockPos origin, Block block, int maxBlocks, boolean requireFoliage) {
-        List<BlockPos> found = new ArrayList<>();
-        Set<BlockPos> visited = new HashSet<>();
-        ArrayDeque<BlockPos> queue = new ArrayDeque<>();
-        visited.add(origin);
-        queue.add(origin);
-        boolean foliage = false;
-
-        while (!queue.isEmpty() && found.size() < maxBlocks) {
-            BlockPos current = queue.poll();
-            for (int dx = -1; dx <= 1 && found.size() < maxBlocks; dx++) {
-                for (int dy = -1; dy <= 1 && found.size() < maxBlocks; dy++) {
-                    for (int dz = -1; dz <= 1 && found.size() < maxBlocks; dz++) {
-                        if (dx == 0 && dy == 0 && dz == 0) {
-                            continue;
-                        }
-
-                        BlockPos next = current.offset(dx, dy, dz);
-                        if (!visited.add(next) || !level.isLoaded(next)) {
-                            continue;
-                        }
-
-                        BlockState state = level.getBlockState(next);
-                        if (state.is(block)) {
-                            found.add(next);
-                            queue.add(next);
-                        } else if (requireFoliage && !foliage && isNaturalFoliage(state)) {
-                            foliage = true;
-                        }
-                    }
-                }
-            }
-        }
-
-        return requireFoliage && !foliage ? List.of() : found;
-    }
-
-    private static boolean isNaturalFoliage(BlockState state) {
-        if (state.is(BlockTags.LEAVES)) {
-            return !state.hasProperty(BlockStateProperties.PERSISTENT) || !state.getValue(BlockStateProperties.PERSISTENT);
-        }
-        return state.is(BlockTags.WART_BLOCKS) || state.is(Blocks.SHROOMLIGHT);
     }
 
     public static void mineArea(ToolKind toolKind, ItemStack stack, Level level, BlockState originState, BlockPos origin, ServerPlayer player, int radius) {
@@ -340,50 +211,23 @@ public final class UltimateToolHelper {
         HOE
     }
 
-    public enum MiningMode {
-        DEFAULT,
-        THREE_BY_THREE,
-        VEIN
-    }
-
-    private static List<MiningMode> availableModes(ToolKind toolKind) {
-        List<MiningMode> modes = new ArrayList<>(3);
-        if (toolKind == null) {
-            return modes;
-        }
-        modes.add(MiningMode.DEFAULT);
-        if (AntarchySettings.ultimateToolsThreeByThreeEnabled()) {
-            modes.add(MiningMode.THREE_BY_THREE);
-        }
-        if (AntarchySettings.ultimateToolsVeinMiningEnabled() && (toolKind == ToolKind.PICKAXE || toolKind == ToolKind.AXE)) {
-            modes.add(MiningMode.VEIN);
-        }
-        return modes;
-    }
-
-    private static void cycleMiningMode(Level level, Player player, ItemStack stack) {
-        List<MiningMode> modes = availableModes(toolKindOf(stack.getItem()));
-        int current = modes.indexOf(getMiningMode(stack));
-        MiningMode next = modes.get((current + 1) % modes.size());
-        if (next == MiningMode.DEFAULT) {
-            CompoundTag tag = stack.getTag();
-            if (tag != null) {
-                tag.remove(THREE_BY_THREE_TAG);
-                tag.remove(MINING_MODE_TAG);
-            }
-        } else {
-            CompoundTag tag = stack.getOrCreateTag();
-            tag.remove(THREE_BY_THREE_TAG);
-            tag.putByte(MINING_MODE_TAG, (byte) next.ordinal());
+    private static void toggleThreeByThree(Level level, Player player, ItemStack stack) {
+        boolean enabled = !isThreeByThreeEnabled(stack);
+        if (enabled) {
+            stack.getOrCreateTag().putBoolean(THREE_BY_THREE_TAG, true);
+        } else if (stack.hasTag()) {
+            stack.getTag().remove(THREE_BY_THREE_TAG);
         }
 
         if (!level.isClientSide) {
-            String key = switch (next) {
-                case DEFAULT -> "message.antarchy.ultimate_tool.mode_default";
-                case THREE_BY_THREE -> "message.antarchy.ultimate_tool.mode_3x3";
-                case VEIN -> "message.antarchy.ultimate_tool.mode_vein";
-            };
-            player.displayClientMessage(Component.translatable(key), true);
+            player.displayClientMessage(
+                    Component.translatable(
+                            enabled
+                                    ? "message.antarchy.ultimate_tool.mode_3x3"
+                                    : "message.antarchy.ultimate_tool.mode_default"
+                    ),
+                    true
+            );
         }
     }
 

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UtlimateShovelItem.java

@@ -34,18 +34,10 @@ public class UtlimateShovelItem extends ShovelItem {
         this.attackSpeed = attackSpeed;
     }
 
-    @Override
-    public com.google.common.collect.Multimap<net.minecraft.world.entity.ai.attributes.Attribute, net.minecraft.world.entity.ai.attributes.AttributeModifier> getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot slot) {
-        if (slot != net.minecraft.world.entity.EquipmentSlot.MAINHAND) {
-            return super.getDefaultAttributeModifiers(slot);
-        }
-        return com.craisinlord.antarchy.compat.item.WeaponAttributes.base(this.tier, (float) this.attackDamage.getAsDouble(), (float) AntarchySettings.ultimateShovelAttackSpeed()).build();
-    }
-
     @Override
     public void appendHoverText(ItemStack stack, Level level, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, level, tooltipComponents, tooltipFlag);
-        UltimateToolHelper.appendModeTooltip(UltimateToolHelper.ToolKind.SHOVEL, tooltipComponents);
+        UltimateToolHelper.appendThreeByThreeTooltip(tooltipComponents);
     }
 
     @Override

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/network/RoyalMountActionPayload.java

@@ -12,8 +12,6 @@ public record RoyalMountActionPayload(int action) implements CustomPacketPayload
     public static final int BITE = 1;
     public static final int SPIT = 2;
     public static final int MOUNT = 3;
-    public static final int BEAM = 4;
-    public static final int SIGNATURE = 5;
 
     public static final Type<RoyalMountActionPayload> TYPE =
             new Type<>(new ResourceLocation(Antarchy.MODID, "royal_mount_action"));

common-1.20.1/src/main/java/com/craisinlord/antarchy/content/worldgen/ants/TermiteNestFeature.java

@@ -34,7 +34,7 @@ public class TermiteNestFeature extends SurfaceAntNestFeature {
     protected BlockPos resolveNestPos(WorldGenLevel level, BlockPos origin) {
         int x = origin.getX();
         int z = origin.getZ();
-        int startY = Math.min(origin.getY(), level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z) - 1);
+        int startY = level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z) - 1;
         int minY = level.getMinBuildHeight() + 1;
 
         for (int y = startY; y >= minY; y--) {

common-1.20.1/src/main/java/com/craisinlord/antarchy/mixins/MantisClawWallClimbMixin.java

@@ -1,6 +1,5 @@
 package com.craisinlord.antarchy.mixins;
 
-import com.craisinlord.antarchy.content.AntarchyTags;
 import com.craisinlord.antarchy.content.item.MantisClawItem;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;
@@ -92,7 +91,6 @@ public abstract class MantisClawWallClimbMixin extends LivingEntity {
         Player player = (Player) (Object) this;
         return MantisClawItem.isDualWielding(player)
                 && this.horizontalCollision
-                && !this.level().dimensionTypeRegistration().is(AntarchyTags.DimensionTypes.NO_MANTIS_CLIMB)
                 && !this.onGround()
                 && !this.isInWaterOrBubble()
                 && !this.isPassenger()

common-1.20.1/src/main/java/com/craisinlord/antarchy/mixins/client/MountedVehicleCameraMixin.java

@@ -1,7 +1,6 @@
 package com.craisinlord.antarchy.mixins.client;
 
 import com.craisinlord.antarchy.content.entity.HerculesBeetleEntity;
-import com.craisinlord.antarchy.content.entity.royal.RoyalMountEntity;
 import net.minecraft.client.Camera;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.BlockGetter;
@@ -11,7 +10,6 @@ import org.spongepowered.asm.mixin.Shadow;
 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;
 
 @Mixin(Camera.class)
@@ -25,18 +23,6 @@ public abstract class MountedVehicleCameraMixin {
     @Shadow
     protected abstract void setPosition(Vec3 position);
 
-    @ModifyArg(
-            method = "setup",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;getMaxZoom(D)D"),
-            index = 0
-    )
-    private double antarchy$extendRoyalMountZoom(double distance) {
-        if (this.entity != null && this.entity.getVehicle() instanceof RoyalMountEntity mount) {
-            return distance + mount.thirdPersonCameraBonus();
-        }
-        return distance;
-    }
-
     @Inject(method = "setup", at = @At("RETURN"))
     private void antarchy$adjustMountedCamera(
             BlockGetter level,
@@ -46,11 +32,6 @@ public abstract class MountedVehicleCameraMixin {
             float partialTick,
             CallbackInfo ci
     ) {
-        if (this.detached && this.entity != null && this.entity.getVehicle() instanceof RoyalMountEntity mount) {
-            Camera camera = (Camera) (Object) this;
-            this.setPosition(camera.getPosition().add(new Vec3(camera.getUpVector()).scale(mount.thirdPersonCameraLift())));
-            return;
-        }
         if (!this.antarchy$ridingHerculesBeetle()) {
             return;
         }

common-1.20.1/src/main/resources/assets/antarchy/lang/de_de.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Auf 3x3-Abbau umgeschaltet",
-    "message.antarchy.ultimate_tool.mode_vein": "Auf Adernabbau umgeschaltet",
     "message.antarchy.ultimate_tool.mode_default": "Auf normalen Abbau umgeschaltet",
     "advancements.antarchy.hey_listen.title": "Hey, hör zu!",
     "advancements.antarchy.hey_listen.description": "Eine Reverie hat sich dir angeschlossen.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Rechtsklick, um dich drehend nach vorn zu bohren und Molevore-Blöcke zu durchdringen.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Rechtsklick, um in die Luft zu springen und mit einer Flächenschockwelle herabzustürzen.",
     "tooltip.antarchy.ultimate_tools_3x3": "Umschalt-Rechtsklick, um 3x3-Abbau umzuschalten.",
-    "tooltip.antarchy.ultimate_tools_vein": "Umschalt-Rechtsklick, um Adernabbau umzuschalten.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Umschalt-Rechtsklick wechselt zwischen 3x3-Abbau und Adernabbau.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Fällt ganze Bäume. Schleichen, um einen einzelnen Stamm zu hacken.",
     "tooltip.antarchy.moggles.reveal": "Gewährt Nachtsicht und weist auf nahe Höhlen hin.",
     "tooltip.antarchy.moggles.underground": "Funktioniert nur, wenn du keinen freien Blick zum Himmel hast.",
     "tooltip.antarchy.cornea_ear.vision": "Gewährt %s Sekunden lang Nachtsicht.",

common-1.20.1/src/main/resources/assets/antarchy/lang/en_us.json

@@ -604,16 +604,6 @@
     "message.antarchy.royal_boundary.activated":  "Royal Boundary raised",
     "message.antarchy.royal_boundary.recharging":  "Royal Boundary is recharging",
     "key.antarchy.mount_flight_toggle":  "Mount: Toggle Flight",
-    "key.antarchy.mount_beam":  "Royal Mount: Beam",
-    "key.antarchy.mount_signature":  "Royal Mount: Command / Time Field",
-    "entity.antarchy.royal_mount.stage.hatchling":  "Hatchling",
-    "entity.antarchy.royal_mount.stage.juvenile":  "Juvenile",
-    "entity.antarchy.royal_mount.stage.adult":  "Adult",
-    "message.antarchy.royal_mount.stage_up":  "%s has reached the %s stage!",
-    "message.antarchy.royal_mount.growth":  "%s: %s, %s%% grown",
-    "message.antarchy.royal_mount.too_young_ride":  "%s must reach the %s stage before it can be ridden",
-    "message.antarchy.royal_mount.too_young_fly":  "%s must reach the %s stage before it can fly",
-    "message.antarchy.royal_mount.too_young_ability":  "%s must reach the %s stage to use that",
     "item.antarchy.springbug_leg":  "Springbug Leg",
     "item.antarchy.springy_boots":  "Springy Boots",
     "tooltip.antarchy.springy_boots":  "Sneak to charge, then jump to spring upward.",
@@ -801,7 +791,6 @@
     "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_vein":  "Switched to Vein 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.",
@@ -840,9 +829,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore":  "Use to spin forward and drill through Molevore blocks.",
     "tooltip.antarchy.big_bertha.mode.toreterror":  "Use to launch into the air and crash down with an AOE shockwave.",
     "tooltip.antarchy.ultimate_tools_3x3":  "Shift + use to toggle 3x3 Mining.",
-    "tooltip.antarchy.ultimate_tools_vein":  "Shift + use to toggle Vein Mining.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein":  "Shift + use to cycle 3x3 and Vein Mining.",
-    "tooltip.antarchy.battle_axe_tree_felling":  "Fells whole trees. Sneak to chop a single log.",
     "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.",
@@ -1658,12 +1644,12 @@
     ,"guide.antarchy.entry.queen.description6": "In her final phase she also casts her own time dilation field, slowing anyone caught inside it."
     ,"guide.antarchy.entry.prince.title": "Prince"
     ,"guide.antarchy.entry.prince.subtitle": "Royal mount record"
-    ,"guide.antarchy.entry.prince.description": "Prince Eggs hatch into Hatchlings bonded to whoever placed the egg. Golden apples grow them a little and enchanted golden apples grow them a lot: Juveniles can be ridden and spit bolts, and Adults can fly, fire beams, and use their signature ability."
-    ,"guide.antarchy.entry.prince.description2": "The Prince is a ground brawler: he closes in to bite with all three heads, spits fire, ice, and lightning, and as an Adult commands nearby hostile mobs to fight for him. Feed responsibly; you are raising a small flying warlord."
+    ,"guide.antarchy.entry.prince.description": "Prince Eggs hatch into small Princes that grow when fed golden items."
+    ,"guide.antarchy.entry.prince.description2": "A grown Prince can be tamed and saddled for flight, fires elemental bolts at your enemies, and can command nearby hostile mobs. Feed responsibly; you are raising a small flying warlord."
     ,"guide.antarchy.entry.princess.title": "Princess"
     ,"guide.antarchy.entry.princess.subtitle": "Royal mount record"
-    ,"guide.antarchy.entry.princess.description": "Princess Eggs hatch into Hatchlings bonded to whoever placed the egg. Golden apples grow them a little and enchanted golden apples grow them a lot: Juveniles can be ridden and spit bolts, and Adults can fly, fire beams, and use their signature ability."
-    ,"guide.antarchy.entry.princess.description2": "The Princess fights at range: she keeps her distance, fires slowing bolts from her orbs, and as an Adult hovers above her foes and traps them in time-dilation fields."
+    ,"guide.antarchy.entry.princess.description": "Princess Eggs hatch into small Princesses that grow when fed golden items."
+    ,"guide.antarchy.entry.princess.description2": "A grown Princess can be tamed and saddled for flight, fires elemental bolts, and creates time-dilation fields around enemies."
     ,"subtitles.antarchy.hoverboard_mount": "Hoverboard starts"
     ,"subtitles.antarchy.hoverboard_dismount": "Hoverboard stops"
     ,"subtitles.antarchy.hoverboard_idle": "Hoverboard hums"

common-1.20.1/src/main/resources/assets/antarchy/lang/es_es.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Cambiado a minería 3x3",
-    "message.antarchy.ultimate_tool.mode_vein": "Cambiado a minería de vetas",
     "message.antarchy.ultimate_tool.mode_default": "Cambiado a minería normal",
     "advancements.antarchy.hey_listen.title": "¡Oye, escucha!",
     "advancements.antarchy.hey_listen.description": "Una Reverie se ha unido a ti.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Clic derecho para girar hacia delante y perforar bloques de Molevore.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Clic derecho para lanzarte al aire y caer con una onda de choque en área.",
     "tooltip.antarchy.ultimate_tools_3x3": "Mayús + clic derecho para alternar la minería 3x3.",
-    "tooltip.antarchy.ultimate_tools_vein": "Mayús + clic derecho para alternar la minería de vetas.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Mayús + clic derecho para alternar entre minería 3x3 y de vetas.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Tala árboles enteros. Agáchate para cortar un solo tronco.",
     "tooltip.antarchy.moggles.reveal": "Otorga Visión nocturna y señala cuevas cercanas.",
     "tooltip.antarchy.moggles.underground": "Solo funciona cuando no tienes acceso al cielo.",
     "tooltip.antarchy.cornea_ear.vision": "Otorga Visión nocturna durante %s segundos.",

common-1.20.1/src/main/resources/assets/antarchy/lang/fr_fr.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Mode minage 3x3 activé",
-    "message.antarchy.ultimate_tool.mode_vein": "Mode minage de filons activé",
     "message.antarchy.ultimate_tool.mode_default": "Mode minage normal activé",
     "advancements.antarchy.hey_listen.title": "Hé, écoute !",
     "advancements.antarchy.hey_listen.description": "Une Reverie vous a rejoint.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Clic droit pour tournoyer vers l’avant et forer les blocs de Molevore.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Clic droit pour bondir dans les airs et retomber avec une onde de choc de zone.",
     "tooltip.antarchy.ultimate_tools_3x3": "Maj + clic droit pour activer ou désactiver le minage 3x3.",
-    "tooltip.antarchy.ultimate_tools_vein": "Maj + clic droit pour activer ou désactiver le minage de filons.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Maj + clic droit pour alterner entre minage 3x3 et minage de filons.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Abat des arbres entiers. Accroupis-toi pour couper une seule bûche.",
     "tooltip.antarchy.moggles.reveal": "Accorde Vision nocturne et indique les grottes proches.",
     "tooltip.antarchy.moggles.underground": "Fonctionne uniquement lorsque vous n’avez pas accès au ciel.",
     "tooltip.antarchy.cornea_ear.vision": "Accorde Vision nocturne pendant %s secondes.",

common-1.20.1/src/main/resources/assets/antarchy/lang/it_it.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Scavo 3×3 attivato",
-    "message.antarchy.ultimate_tool.mode_vein": "Scavo di vene attivato",
     "message.antarchy.ultimate_tool.mode_default": "Scavo normale attivato",
     "advancements.antarchy.hey_listen.title": "Ehi, ascolta!",
     "advancements.antarchy.hey_listen.description": "Una Reverie si è unita a te.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Fai clic destro per ruotare in avanti e perforare i blocchi di Molevore.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Fai clic destro per balzare in aria e schiantarti con un’onda d’urto ad area.",
     "tooltip.antarchy.ultimate_tools_3x3": "Maiusc + clic destro per attivare o disattivare lo scavo 3×3.",
-    "tooltip.antarchy.ultimate_tools_vein": "Maiusc + clic destro per attivare o disattivare lo scavo di vene.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Maiusc + clic destro per alternare scavo 3×3 e scavo di vene.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Abbatte alberi interi. Accovacciati per tagliare un solo tronco.",
     "tooltip.antarchy.moggles.reveal": "Fornisce Visione notturna e indica le grotte vicine.",
     "tooltip.antarchy.moggles.underground": "Funziona solo quando non puoi vedere il cielo.",
     "tooltip.antarchy.cornea_ear.vision": "Conferisce Visione notturna per %s secondi.",

common-1.20.1/src/main/resources/assets/antarchy/lang/ja_jp.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "モールヴォア",
     "message.antarchy.big_bertha.mode.toreterror": "トアテラー",
     "message.antarchy.ultimate_tool.mode_3x3": "3×3採掘に切り替えました",
-    "message.antarchy.ultimate_tool.mode_vein": "鉱脈採掘に切り替えました",
     "message.antarchy.ultimate_tool.mode_default": "通常採掘に切り替えました",
     "advancements.antarchy.hey_listen.title": "ねえ、聞いて！",
     "advancements.antarchy.hey_listen.description": "レヴェリーが仲間になりました。",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "右クリックで回転しながら前進し、モールヴォアブロックを掘り抜きます。",
     "tooltip.antarchy.big_bertha.mode.toreterror": "右クリックで空中へ飛び上がり、範囲衝撃波とともに落下します。",
     "tooltip.antarchy.ultimate_tools_3x3": "シフトキー＋右クリックで3×3採掘を切り替えます。",
-    "tooltip.antarchy.ultimate_tools_vein": "シフトキー＋右クリックで鉱脈採掘を切り替えます。",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "シフトキー＋右クリックで3×3採掘と鉱脈採掘を切り替えます。",
-    "tooltip.antarchy.battle_axe_tree_felling": "木を丸ごと伐採します。スニーク中は原木を1つだけ切ります。",
     "tooltip.antarchy.moggles.reveal": "暗視を付与し、近くの洞窟を示します。",
     "tooltip.antarchy.moggles.underground": "空が見えない場所でのみ機能します。",
     "tooltip.antarchy.cornea_ear.vision": "%s秒間暗視を付与します。",

common-1.20.1/src/main/resources/assets/antarchy/lang/ko_kr.json

@@ -792,7 +792,6 @@
     "message.antarchy.big_bertha.mode.molevore":  "몰레보어",
     "message.antarchy.big_bertha.mode.toreterror":  "토레테러",
     "message.antarchy.ultimate_tool.mode_3x3":  "3x3 채굴 모드로 전환됨",
-    "message.antarchy.ultimate_tool.mode_vein":  "광맥 채굴 모드로 전환됨",
     "message.antarchy.ultimate_tool.mode_default":  "기본 채굴 모드로 전환됨",
     "advancements.antarchy.hey_listen.title":  "야, 들어봐!",
     "advancements.antarchy.hey_listen.description":  "레버리가 당신과 함께합니다.",
@@ -831,9 +830,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore":  "공격 시 추가 피해를 입히고 대상을 공중 높이 띄웁니다.",
     "tooltip.antarchy.big_bertha.mode.toreterror":  "사용하여 앞으로 회전하며 몰레보어 블록을 뚫고 나아갑니다.",
     "tooltip.antarchy.ultimate_tools_3x3":  "Shift + 사용: 3x3 채굴을 켜거나 끕니다.",
-    "tooltip.antarchy.ultimate_tools_vein":  "Shift + 사용: 광맥 채굴을 켜거나 끕니다.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein":  "Shift + 사용: 3x3 채굴과 광맥 채굴을 전환합니다.",
-    "tooltip.antarchy.battle_axe_tree_felling":  "나무 전체를 벱니다. 웅크리면 통나무 하나만 벱니다.",
     "tooltip.antarchy.moggles.reveal":  "야간 시야를 부여하고 근처 동굴을 가리킵니다.",
     "tooltip.antarchy.moggles.underground":  "하늘이 가려진 곳에서만 작동합니다.",
     "tooltip.antarchy.cornea_ear.vision":  "%s초 동안 야간 시야를 부여합니다.",

common-1.20.1/src/main/resources/assets/antarchy/lang/pt_br.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Alternado para Mineração 3x3",
-    "message.antarchy.ultimate_tool.mode_vein": "Alternado para Mineração de Veios",
     "message.antarchy.ultimate_tool.mode_default": "Alternado para Mineração Padrão",
     "advancements.antarchy.hey_listen.title": "Ei, Escute!",
     "advancements.antarchy.hey_listen.description": "Uma Reverie se juntou a você.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Clique com o botão direito para girar para a frente e perfurar blocos de Molevore.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Clique com o botão direito para se lançar ao ar e cair com uma onda de choque em área.",
     "tooltip.antarchy.ultimate_tools_3x3": "Shift + clique com o botão direito para alternar a Mineração 3x3.",
-    "tooltip.antarchy.ultimate_tools_vein": "Shift + clique com o botão direito para alternar a Mineração de Veios.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Shift + clique com o botão direito para alternar entre Mineração 3x3 e de Veios.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Derruba árvores inteiras. Agache para cortar um único tronco.",
     "tooltip.antarchy.moggles.reveal": "Concede Visão Noturna e aponta para cavernas próximas.",
     "tooltip.antarchy.moggles.underground": "Funciona apenas quando você não tem acesso ao céu.",
     "tooltip.antarchy.cornea_ear.vision": "Concede Visão Noturna por %s segundos.",

common-1.20.1/src/main/resources/assets/antarchy/lang/ru_ru.json

@@ -488,7 +488,6 @@
     "message.antarchy.big_bertha.mode.molevore":  "Кротожор",
     "message.antarchy.big_bertha.mode.toreterror":  "Тортеррор",
     "message.antarchy.ultimate_tool.mode_3x3":  "Включено копание 3x3",
-    "message.antarchy.ultimate_tool.mode_vein":  "Включена добыча жил",
     "message.antarchy.ultimate_tool.mode_default":  "Включено обычное копание",
     "advancements.antarchy.hey_listen.title":  "Эй, послушай",
     "advancements.antarchy.hey_listen.description":  "К вам присоединилась грёза.",
@@ -521,9 +520,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore":  "ПКМ для рывка вперёд и бурения сквозь блоки кротожора.",
     "tooltip.antarchy.big_bertha.mode.toreterror":  "ПКМ запускает вас в воздух и обрушивает вниз с ударной волной по площади.",
     "tooltip.antarchy.ultimate_tools_3x3":  "Shift + ПКМ для переключения режима копания 3x3.",
-    "tooltip.antarchy.ultimate_tools_vein":  "Shift + ПКМ для переключения добычи жил.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein":  "Shift + ПКМ переключает копание 3x3 и добычу жил.",
-    "tooltip.antarchy.battle_axe_tree_felling":  "Срубает дерево целиком. Присядьте, чтобы срубить одно бревно.",
     "tooltip.antarchy.moggles.reveal":  "Дают ночное зрение и указывают на ближайшие пещеры.",
     "tooltip.antarchy.moggles.underground":  "Работает только если над вами нет открытого неба.",
     "tooltip.antarchy.cornea_ear.vision":  "Даёт Ночное зрение на %s секунд.",

common-1.20.1/src/main/resources/assets/antarchy/lang/zh_cn.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "莫尔沃尔",
     "message.antarchy.big_bertha.mode.toreterror": "托尔泰罗尔",
     "message.antarchy.ultimate_tool.mode_3x3": "已切换至3×3挖掘",
-    "message.antarchy.ultimate_tool.mode_vein": "已切换至连锁挖矿",
     "message.antarchy.ultimate_tool.mode_default": "已切换至默认挖掘",
     "advancements.antarchy.hey_listen.title": "嘿，听着！",
     "advancements.antarchy.hey_listen.description": "一只雷弗里加入了你。",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "右键旋转向前并钻穿莫尔沃尔方块。",
     "tooltip.antarchy.big_bertha.mode.toreterror": "右键跃向空中并以范围冲击波砸落。",
     "tooltip.antarchy.ultimate_tools_3x3": "潜行键＋右键切换3×3挖掘。",
-    "tooltip.antarchy.ultimate_tools_vein": "潜行键＋右键切换连锁挖矿。",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "潜行键＋右键在3×3挖掘与连锁挖矿之间切换。",
-    "tooltip.antarchy.battle_axe_tree_felling": "一次砍倒整棵树。潜行时只砍一块原木。",
     "tooltip.antarchy.moggles.reveal": "获得夜视并指向附近洞穴。",
     "tooltip.antarchy.moggles.underground": "仅在无法接触天空时生效。",
     "tooltip.antarchy.cornea_ear.vision": "获得%s秒夜视。",

common-1.20.1/src/main/resources/assets/antarchy/lang/zh_tw.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "莫爾沃爾",
     "message.antarchy.big_bertha.mode.toreterror": "托爾泰羅爾",
     "message.antarchy.ultimate_tool.mode_3x3": "已切換至3×3挖掘",
-    "message.antarchy.ultimate_tool.mode_vein": "已切換至連鎖挖礦",
     "message.antarchy.ultimate_tool.mode_default": "已切換至預設挖掘",
     "advancements.antarchy.hey_listen.title": "嘿，聽著！",
     "advancements.antarchy.hey_listen.description": "一隻雷弗里加入了你。",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "右鍵旋轉向前並鑽穿莫爾沃爾方塊。",
     "tooltip.antarchy.big_bertha.mode.toreterror": "右鍵躍向空中並以範圍衝擊波砸落。",
     "tooltip.antarchy.ultimate_tools_3x3": "潛行鍵＋右鍵切換3×3挖掘。",
-    "tooltip.antarchy.ultimate_tools_vein": "潛行鍵＋右鍵切換連鎖挖礦。",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "潛行鍵＋右鍵在3×3挖掘與連鎖挖礦之間切換。",
-    "tooltip.antarchy.battle_axe_tree_felling": "一次砍倒整棵樹。潛行時只砍一塊原木。",
     "tooltip.antarchy.moggles.reveal": "獲得夜視並指向附近洞穴。",
     "tooltip.antarchy.moggles.underground": "僅在無法接觸天空時生效。",
     "tooltip.antarchy.cornea_ear.vision": "獲得%s秒夜視。",

common-1.20.1/src/main/resources/data/antarchy/worldgen/biome/cavaryn_moleworm_caves.json

@@ -55,8 +55,7 @@
     ],
     [
       "antarchy:moleworm_caves_creepvine",
-      "antarchy:moleworm_caves_hanging_creeproots",
-      "antarchy:termite_nest"
+      "antarchy:moleworm_caves_hanging_creeproots"
     ],
     []
   ],

common-1.20.1/src/main/resources/data/antarchy/worldgen/biome/wormy_caves.json

@@ -52,8 +52,7 @@
       "antarchy:wormy_caves_creepvine",
       "antarchy:wormy_caves_hanging_creeproots",
       "antarchy:wormy_caves_molting_vines",
-      "antarchy:wormy_caves_ground_molting_vines",
-      "antarchy:termite_nest"
+      "antarchy:wormy_caves_ground_molting_vines"
     ],
     []
   ],

common-1.20.1/src/main/resources/data/antarchy/worldgen/placed_feature/red_ant_nest.json

@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 8
+      "chance": 24
     },
     {
       "type": "minecraft:in_square"

common-1.20.1/src/main/resources/data/antarchy/worldgen/placed_feature/red_ant_nest_magma.json

@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 8
+      "chance": 24
     },
     {
       "type": "minecraft:in_square"

common-1.20.1/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json

@@ -3,22 +3,14 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 24
+      "chance": 88
     },
     {
       "type": "minecraft:in_square"
     },
     {
-      "type": "minecraft:height_range",
-      "height": {
-        "type": "minecraft:uniform",
-        "min_inclusive": {
-          "absolute": 8
-        },
-        "max_inclusive": {
-          "absolute": 190
-        }
-      }
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
     },
     {
       "type": "minecraft:biome"

common-1.20.1/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest_cavaryn.json

@@ -3,22 +3,14 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 16
+      "chance": 44
     },
     {
       "type": "minecraft:in_square"
     },
     {
-      "type": "minecraft:height_range",
-      "height": {
-        "type": "minecraft:uniform",
-        "min_inclusive": {
-          "absolute": 8
-        },
-        "max_inclusive": {
-          "absolute": 190
-        }
-      }
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
     },
     {
       "type": "minecraft:biome"

common-1.21.1/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java

@@ -107,9 +107,6 @@ public final class AntarchySettings {
     private static int ultimateCrossbowEnchantability = 20;
     private static int ultimateMaceEnchantability = 20;
     private static boolean ultimateToolsThreeByThreeEnabled = true;
-    private static boolean ultimateToolsVeinMiningEnabled = true;
-    private static int ultimateToolsVeinMiningMaxBlocks = 64;
-    private static int ultimateToolsTreeFellingMaxLogs = 128;
     private static boolean ultimateArmorComesEnchanted = true;
     private static int ultimateHelmetArmorValue = 6;
     private static int ultimateChestplateArmorValue = 11;
@@ -302,7 +299,6 @@ public final class AntarchySettings {
     private static double royalBossKnockbackResistance = 1.0D;
     private static double royalBossStepHeight = 3.0D;
     private static double royalBossMaxSingleHitDamage = 250.0D;
-    private static double royalBossHitOverflowRate = 0.25D;
     private static double royalBossBiteReach = 12.0D;
     private static double royalBossBiteDamageMultiplier = 1.6D;
     private static int royalBossBiteCooldownTicks = 45;
@@ -979,18 +975,6 @@ public final class AntarchySettings {
         return ultimateToolsThreeByThreeEnabled;
     }
 
-    public static boolean ultimateToolsVeinMiningEnabled() {
-        return ultimateToolsVeinMiningEnabled;
-    }
-
-    public static int ultimateToolsVeinMiningMaxBlocks() {
-        return ultimateToolsVeinMiningMaxBlocks;
-    }
-
-    public static int ultimateToolsTreeFellingMaxLogs() {
-        return ultimateToolsTreeFellingMaxLogs;
-    }
-
     public static boolean ultimateArmorComesEnchanted() {
         return ultimateArmorComesEnchanted;
     }
@@ -1641,18 +1625,6 @@ public final class AntarchySettings {
         ultimateToolsThreeByThreeEnabled = value;
     }
 
-    public static void setUltimateToolsVeinMiningEnabled(boolean value) {
-        ultimateToolsVeinMiningEnabled = value;
-    }
-
-    public static void setUltimateToolsVeinMiningMaxBlocks(int value) {
-        ultimateToolsVeinMiningMaxBlocks = value;
-    }
-
-    public static void setUltimateToolsTreeFellingMaxLogs(int value) {
-        ultimateToolsTreeFellingMaxLogs = value;
-    }
-
     public static void setUltimateArmorComesEnchanted(boolean value) {
         ultimateArmorComesEnchanted = value;
     }
@@ -2258,9 +2230,6 @@ public final class AntarchySettings {
     public static double royalBossMaxSingleHitDamage() { return royalBossMaxSingleHitDamage; }
     public static void setRoyalBossMaxSingleHitDamage(double v) { royalBossMaxSingleHitDamage = v; }
 
-    public static double royalBossHitOverflowRate() { return royalBossHitOverflowRate; }
-    public static void setRoyalBossHitOverflowRate(double v) { royalBossHitOverflowRate = v; }
-
     public static double royalBossBiteReach() { return royalBossBiteReach; }
     public static void setRoyalBossBiteReach(double v) { royalBossBiteReach = v; }
 

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java

@@ -11,7 +11,6 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.material.Fluid;
 
 public final class AntarchyTags {
@@ -158,11 +157,4 @@ public final class AntarchyTags {
         private Biomes() {
         }
     }
-
-    public static final class DimensionTypes {
-        public static final TagKey<DimensionType> NO_MANTIS_CLIMB = TagKey.create(Registries.DIMENSION_TYPE, id("no_mantis_climb"));
-
-        private DimensionTypes() {
-        }
-    }
 }

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/effect/BloodglassWardEffect.java

@@ -21,7 +21,7 @@ public final class BloodglassWardEffect extends MobEffect {
     public void addAttributeModifiers(AttributeMap attributeMap, int amplifier) {
         AttributeInstance instance = attributeMap.getInstance(AntarchyObjects.BLOODGLASS_MAX_HEARTS.get());
         if (instance == null) return;
-        instance.addOrUpdateTransientModifier(
+        instance.addTransientModifier(
                 new AttributeModifier(MODIFIER_ID, amplifier + 1, AttributeModifier.Operation.ADD_VALUE)
         );
     }

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/effect/GrowthMobEffect.java

@@ -23,7 +23,7 @@ public final class GrowthMobEffect extends MobEffect {
         AttributeInstance instance = attributeMap.getInstance(Attributes.SCALE);
         if (instance == null) return;
         double amount = AntarchySettings.growthPotionDelta() * (amplifier + 1);
-        instance.addOrUpdateTransientModifier(
+        instance.addTransientModifier(
                 new AttributeModifier(MODIFIER_ID, amount, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL)
         );
     }

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/effect/RoyalVitalityPenaltyEffect.java

@@ -21,7 +21,7 @@ public final class RoyalVitalityPenaltyEffect extends MobEffect {
     public void addAttributeModifiers(AttributeMap attributeMap, int amplifier) {
         AttributeInstance maxHealth = attributeMap.getInstance(Attributes.MAX_HEALTH);
         if (maxHealth == null) return;
-        maxHealth.addOrUpdateTransientModifier(new AttributeModifier(
+        maxHealth.addTransientModifier(new AttributeModifier(
                 MODIFIER_ID, -0.5D, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL));
     }
 

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/effect/ShrinkMobEffect.java

@@ -23,7 +23,7 @@ public final class ShrinkMobEffect extends MobEffect {
         AttributeInstance instance = attributeMap.getInstance(Attributes.SCALE);
         if (instance == null) return;
         double amount = -(AntarchySettings.shrinkingPotionDelta() * (amplifier + 1));
-        instance.addOrUpdateTransientModifier(
+        instance.addTransientModifier(
                 new AttributeModifier(MODIFIER_ID, amount, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL)
         );
     }

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/HerculesBeetleEntity.java

@@ -391,9 +391,6 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
         if (this.isKnockedDown()) {
             this.tickKnockedDown();
         } else if (this.isLeashed()) {
-            if (this.chargeTicksRemaining > 0 || this.isChargeAnimationActive()) {
-                this.endChargeState();
-            }
             this.getNavigation().stop();
             this.setTarget(null);
             this.updateAmbientAnimation();
@@ -486,10 +483,6 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
     }
 
     private void tickCharge() {
-        if (this.chargeTicksRemaining <= 0) {
-            this.endChargeState();
-            return;
-        }
         if (this.getAnimationState() != ANIM_CHARGE) {
             this.setAnimationState(ANIM_CHARGE);
         }
@@ -916,9 +909,6 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
         if (!this.isFlying() && !mountedCharge) {
             this.pendingChargeStart = true;
             this.requestFlightStart();
-            if (this.getAnimationState() != ANIM_OPEN_WINGS) {
-                this.pendingChargeStart = false;
-            }
             return;
         }
         this.beginChargeStart(this.chargeDirection, this.pendingChargeDuration, mountedCharge);
@@ -988,23 +978,13 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
         serverLevel.sendParticles(ParticleTypes.CRIT, this.getX(), this.getY() + 0.8D, this.getZ(), 20, 2.0D, 0.6D, 2.0D, 0.08D);
         this.broadcastImpactShake(serverLevel);
 
-        this.endChargeState();
-    }
-
-    private void endChargeState() {
-        this.chargeTicksRemaining = 0;
-        this.groundedMountedCharge = false;
-        this.noPhysics = false;
-        this.setAnimationState(this.isFlying() ? ANIM_FLY : ANIM_IDLE);
-        if (!this.isVehicle() && this.isFlying() && this.hasGroundBelow()) {
+        if (this.onGround()) {
             this.requestFlightStop();
+        } else {
+            this.updateAmbientAnimation();
         }
     }
 
-    private boolean hasGroundBelow() {
-        return !this.level().noCollision(this, this.getBoundingBox().move(this.toWorld(0.0D, -0.2D, 0.0D)));
-    }
-
     private void breakBlocksForChargeImpact(ServerLevel level) {
         if (!this.isHerculesBeetleGriefingEnabled(level)) {
             return;
@@ -1443,9 +1423,6 @@ public class HerculesBeetleEntity extends TamableAnimal implements GeoEntity, Fl
         this.chargeCooldown = tag.getInt("ChargeCooldown");
         this.attackCooldown = tag.getInt("AttackCooldown");
         this.combatCryDone = tag.getBoolean("CombatCryDone");
-        if (this.isChargeAnimationActive()) {
-            this.setAnimationState(this.isFlying() ? ANIM_FLY : ANIM_IDLE);
-        }
         if (this.isKnockedDown() && this.getAnimationState() != ANIM_KNOCKED_DOWN_IDLE) {
             this.setAnimationState(ANIM_KNOCKED_DOWN_IDLE);
         }

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalBossEntity.java

@@ -2009,8 +2009,7 @@ public abstract class RoyalBossEntity extends Monster implements GeoEntity, Mult
         if (source.is(DamageTypes.GENERIC_KILL)) {
             return super.hurt(source, amount);
         }
-        float cap = (float) AntarchySettings.royalBossMaxSingleHitDamage();
-        float cappedAmount = amount <= cap ? amount : cap + (amount - cap) * (float) AntarchySettings.royalBossHitOverflowRate();
+        float cappedAmount = (float) Math.min(amount, AntarchySettings.royalBossMaxSingleHitDamage());
         return super.hurt(source, cappedAmount);
     }
 

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/BattleAxeItem.java

@@ -2,24 +2,14 @@ package com.craisinlord.antarchy.content.item;
 
 import com.craisinlord.antarchy.config.AntarchySettings;
 import com.craisinlord.antarchy.content.client.model.ResourceBackedGeoItemModel;
-import com.craisinlord.antarchy.content.item.ultimate.UltimateToolHelper;
-import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.DoubleSupplier;
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.AxeItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Tier;
-import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.component.ItemAttributeModifiers;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
 import software.bernie.geckolib.animatable.GeoItem;
 import software.bernie.geckolib.animatable.client.GeoRenderProvider;
 import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache;
@@ -50,25 +40,6 @@ public class BattleAxeItem extends AxeItem implements GeoItem {
         return createAttributes(this.tier, (float) this.attackDamage.getAsDouble(), (float) AntarchySettings.battleAxeAttackSpeed());
     }
 
-    @Override
-    public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
-        super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
-        if (AntarchySettings.ultimateToolsVeinMiningEnabled()) {
-            tooltipComponents.add(Component.translatable("tooltip.antarchy.battle_axe_tree_felling").withStyle(ChatFormatting.GRAY));
-        }
-    }
-
-    @Override
-    public boolean mineBlock(ItemStack stack, Level level, BlockState state, BlockPos pos, LivingEntity miningEntity) {
-        boolean result = super.mineBlock(stack, level, state, pos, miningEntity);
-        if (AntarchySettings.ultimateToolsVeinMiningEnabled()
-                && miningEntity instanceof ServerPlayer player
-                && !player.isShiftKeyDown()) {
-            UltimateToolHelper.mineTree(stack, level, state, pos, player, AntarchySettings.ultimateToolsTreeFellingMaxLogs());
-        }
-        return result;
-    }
-
     @Override
     public boolean isEnchantable(ItemStack stack) {
         return stack.getCount() == 1;

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimateAxeItem.java

@@ -40,7 +40,7 @@ public class UltimateAxeItem extends AxeItem {
     @Override
     public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
-        UltimateToolHelper.appendModeTooltip(UltimateToolHelper.ToolKind.AXE, tooltipComponents);
+        UltimateToolHelper.appendThreeByThreeTooltip(tooltipComponents);
     }
 
     @Override

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimateHoeItem.java

@@ -40,7 +40,7 @@ public class UltimateHoeItem extends HoeItem {
     @Override
     public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
-        UltimateToolHelper.appendModeTooltip(UltimateToolHelper.ToolKind.HOE, tooltipComponents);
+        UltimateToolHelper.appendThreeByThreeTooltip(tooltipComponents);
     }
 
     @Override

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimatePickaxeItem.java

@@ -40,7 +40,7 @@ public class UltimatePickaxeItem extends PickaxeItem {
     @Override
     public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
-        UltimateToolHelper.appendModeTooltip(UltimateToolHelper.ToolKind.PICKAXE, tooltipComponents);
+        UltimateToolHelper.appendThreeByThreeTooltip(tooltipComponents);
     }
 
     @Override

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimateToolHelper.java

@@ -3,17 +3,13 @@ package com.craisinlord.antarchy.content.item.ultimate;
 import com.craisinlord.antarchy.config.AntarchySettings;
 import com.craisinlord.antarchy.content.item.GiantFryingPanItem;
 import com.craisinlord.antarchy.content.item.GiantFryingPanToolHelper;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.function.Function;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.component.DataComponents;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -29,16 +25,12 @@ import net.minecraft.world.item.Tier;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.item.component.CustomData;
 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.state.BlockState;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 
 public final class UltimateToolHelper {
     private static final String THREE_BY_THREE_TAG = "antarchy.ultimate_three_by_three";
-    private static final String MINING_MODE_TAG = "antarchy.ultimate_mining_mode";
     private static final ThreadLocal<Boolean> BREAKING_EXTRA_BLOCKS = ThreadLocal.withInitial(() -> false);
     private static final float GENERAL_MINING_MULTIPLIER = 1.1F;
     private static final float ULTIMATE_SHOVEL_MINING_SPEED = 24.0F;
@@ -48,40 +40,26 @@ public final class UltimateToolHelper {
 
     public static InteractionResultHolder<ItemStack> handleToggleUse(Level level, Player player, InteractionHand hand) {
         ItemStack stack = player.getItemInHand(hand);
-        if (!player.isShiftKeyDown() || availableModes(toolKindOf(stack.getItem())).size() < 2) {
+        if (!AntarchySettings.ultimateToolsThreeByThreeEnabled() || !player.isShiftKeyDown()) {
             return InteractionResultHolder.pass(stack);
         }
 
-        cycleMiningMode(level, player, stack);
+        toggleThreeByThree(level, player, stack);
         return InteractionResultHolder.sidedSuccess(stack, level.isClientSide);
     }
 
     public static InteractionResult handleToggleUseOn(UseOnContext context) {
         Player player = context.getPlayer();
-        if (player == null || !player.isShiftKeyDown() || availableModes(toolKindOf(context.getItemInHand().getItem())).size() < 2) {
+        if (!AntarchySettings.ultimateToolsThreeByThreeEnabled() || player == null || !player.isShiftKeyDown()) {
             return InteractionResult.PASS;
         }
 
-        cycleMiningMode(context.getLevel(), player, context.getItemInHand());
+        toggleThreeByThree(context.getLevel(), player, context.getItemInHand());
         return InteractionResult.sidedSuccess(context.getLevel().isClientSide);
     }
 
     public static boolean isThreeByThreeEnabled(ItemStack stack) {
-        return getMiningMode(stack) == MiningMode.THREE_BY_THREE;
-    }
-
-    public static boolean isVeinEnabled(ItemStack stack) {
-        return getMiningMode(stack) == MiningMode.VEIN;
-    }
-
-    public static MiningMode getMiningMode(ItemStack stack) {
-        CompoundTag tag = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag();
-        if (tag.contains(MINING_MODE_TAG)) {
-            int index = tag.getByte(MINING_MODE_TAG);
-            MiningMode[] modes = MiningMode.values();
-            return index >= 0 && index < modes.length ? modes[index] : MiningMode.DEFAULT;
-        }
-        return tag.getBoolean(THREE_BY_THREE_TAG) ? MiningMode.THREE_BY_THREE : MiningMode.DEFAULT;
+        return stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getBoolean(THREE_BY_THREE_TAG);
     }
 
     public static float getDestroySpeed(ToolKind toolKind, Tier tier, ItemStack stack, BlockState state, float defaultSpeed) {
@@ -98,127 +76,23 @@ public final class UltimateToolHelper {
         return defaultSpeed * GENERAL_MINING_MULTIPLIER;
     }
 
-    public static void appendModeTooltip(ToolKind toolKind, List<Component> tooltip) {
-        List<MiningMode> modes = availableModes(toolKind);
-        boolean area = modes.contains(MiningMode.THREE_BY_THREE);
-        boolean vein = modes.contains(MiningMode.VEIN);
-        String key;
-        if (area && vein) {
-            key = "tooltip.antarchy.ultimate_tools_3x3_vein";
-        } else if (area) {
-            key = "tooltip.antarchy.ultimate_tools_3x3";
-        } else if (vein) {
-            key = "tooltip.antarchy.ultimate_tools_vein";
-        } else {
+    public static void appendThreeByThreeTooltip(List<Component> tooltip) {
+        if (!AntarchySettings.ultimateToolsThreeByThreeEnabled()) {
             return;
         }
-        tooltip.add(Component.translatable(key).withStyle(ChatFormatting.GRAY));
+        tooltip.add(Component.translatable("tooltip.antarchy.ultimate_tools_3x3").withStyle(ChatFormatting.GRAY));
     }
 
     public static void handleAreaMining(ToolKind toolKind, ItemStack stack, Level level, BlockState originState, BlockPos origin, LivingEntity entity) {
-        if (level.isClientSide
+        if (!AntarchySettings.ultimateToolsThreeByThreeEnabled()
+                || level.isClientSide
                 || BREAKING_EXTRA_BLOCKS.get()
+                || !isThreeByThreeEnabled(stack)
                 || !(entity instanceof ServerPlayer player)) {
             return;
         }
 
-        MiningMode mode = getMiningMode(stack);
-        if (mode == MiningMode.DEFAULT || !availableModes(toolKind).contains(mode)) {
-            return;
-        }
-        if (mode == MiningMode.THREE_BY_THREE) {
         mineArea(toolKind, stack, level, originState, origin, player, 1);
-        } else {
-            mineVein(toolKind, stack, level, originState, origin, player, veinLimit(originState));
-        }
-    }
-
-    public static int veinLimit(BlockState state) {
-        return state.is(BlockTags.LOGS)
-                ? AntarchySettings.ultimateToolsTreeFellingMaxLogs()
-                : AntarchySettings.ultimateToolsVeinMiningMaxBlocks();
-    }
-
-    public static void mineVein(ToolKind toolKind, ItemStack stack, Level level, BlockState originState, BlockPos origin, ServerPlayer player, int maxBlocks) {
-        if (level.isClientSide || BREAKING_EXTRA_BLOCKS.get() || maxBlocks <= 0 || !matchesToolKind(toolKind, originState)) {
-            return;
-        }
-
-        breakAll(toolKind, stack, level, player, collectConnected(level, origin, originState.getBlock(), maxBlocks, false));
-    }
-
-    public static void mineTree(ItemStack stack, Level level, BlockState originState, BlockPos origin, ServerPlayer player, int maxBlocks) {
-        if (level.isClientSide || BREAKING_EXTRA_BLOCKS.get() || maxBlocks <= 0 || !originState.is(BlockTags.LOGS)) {
-            return;
-        }
-
-        breakAll(ToolKind.AXE, stack, level, player, collectConnected(level, origin, originState.getBlock(), maxBlocks, true));
-    }
-
-    private static void breakAll(ToolKind toolKind, ItemStack stack, Level level, ServerPlayer player, List<BlockPos> targets) {
-        if (targets.isEmpty()) {
-            return;
-        }
-
-        BREAKING_EXTRA_BLOCKS.set(true);
-        try {
-            for (BlockPos targetPos : targets) {
-                if (!canBreak(toolKind, player, stack, level, targetPos, level.getBlockState(targetPos))) {
-                    continue;
-                }
-
-                player.gameMode.destroyBlock(targetPos);
-                if (stack.isEmpty()) {
-                    break;
-                }
-            }
-        } finally {
-            BREAKING_EXTRA_BLOCKS.set(false);
-        }
-    }
-
-    private static List<BlockPos> collectConnected(Level level, BlockPos origin, Block block, int maxBlocks, boolean requireFoliage) {
-        List<BlockPos> found = new ArrayList<>();
-        Set<BlockPos> visited = new HashSet<>();
-        ArrayDeque<BlockPos> queue = new ArrayDeque<>();
-        visited.add(origin);
-        queue.add(origin);
-        boolean foliage = false;
-
-        while (!queue.isEmpty() && found.size() < maxBlocks) {
-            BlockPos current = queue.poll();
-            for (int dx = -1; dx <= 1 && found.size() < maxBlocks; dx++) {
-                for (int dy = -1; dy <= 1 && found.size() < maxBlocks; dy++) {
-                    for (int dz = -1; dz <= 1 && found.size() < maxBlocks; dz++) {
-                        if (dx == 0 && dy == 0 && dz == 0) {
-                            continue;
-                        }
-
-                        BlockPos next = current.offset(dx, dy, dz);
-                        if (!visited.add(next) || !level.isLoaded(next)) {
-                            continue;
-                        }
-
-                        BlockState state = level.getBlockState(next);
-                        if (state.is(block)) {
-                            found.add(next);
-                            queue.add(next);
-                        } else if (requireFoliage && !foliage && isNaturalFoliage(state)) {
-                            foliage = true;
-                        }
-                    }
-                }
-            }
-        }
-
-        return requireFoliage && !foliage ? List.of() : found;
-    }
-
-    private static boolean isNaturalFoliage(BlockState state) {
-        if (state.is(BlockTags.LEAVES)) {
-            return !state.hasProperty(BlockStateProperties.PERSISTENT) || !state.getValue(BlockStateProperties.PERSISTENT);
-        }
-        return state.is(BlockTags.WART_BLOCKS) || state.is(Blocks.SHROOMLIGHT);
     }
 
     public static void mineArea(ToolKind toolKind, ItemStack stack, Level level, BlockState originState, BlockPos origin, ServerPlayer player, int radius) {
@@ -339,47 +213,25 @@ public final class UltimateToolHelper {
         HOE
     }
 
-    public enum MiningMode {
-        DEFAULT,
-        THREE_BY_THREE,
-        VEIN
-    }
-
-    private static List<MiningMode> availableModes(ToolKind toolKind) {
-        List<MiningMode> modes = new ArrayList<>(3);
-        if (toolKind == null) {
-            return modes;
-        }
-        modes.add(MiningMode.DEFAULT);
-        if (AntarchySettings.ultimateToolsThreeByThreeEnabled()) {
-            modes.add(MiningMode.THREE_BY_THREE);
-        }
-        if (AntarchySettings.ultimateToolsVeinMiningEnabled() && (toolKind == ToolKind.PICKAXE || toolKind == ToolKind.AXE)) {
-            modes.add(MiningMode.VEIN);
-        }
-        return modes;
-    }
-
-    private static void cycleMiningMode(Level level, Player player, ItemStack stack) {
-        List<MiningMode> modes = availableModes(toolKindOf(stack.getItem()));
-        int current = modes.indexOf(getMiningMode(stack));
-        MiningMode next = modes.get((current + 1) % modes.size());
+    private static void toggleThreeByThree(Level level, Player player, ItemStack stack) {
+        boolean enabled = !isThreeByThreeEnabled(stack);
         CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> {
-            tag.remove(THREE_BY_THREE_TAG);
-            if (next == MiningMode.DEFAULT) {
-                tag.remove(MINING_MODE_TAG);
+            if (enabled) {
+                tag.putBoolean(THREE_BY_THREE_TAG, true);
             } else {
-                tag.putByte(MINING_MODE_TAG, (byte) next.ordinal());
+                tag.remove(THREE_BY_THREE_TAG);
             }
         });
 
         if (!level.isClientSide) {
-            String key = switch (next) {
-                case DEFAULT -> "message.antarchy.ultimate_tool.mode_default";
-                case THREE_BY_THREE -> "message.antarchy.ultimate_tool.mode_3x3";
-                case VEIN -> "message.antarchy.ultimate_tool.mode_vein";
-            };
-            player.displayClientMessage(Component.translatable(key), true);
+            player.displayClientMessage(
+                    Component.translatable(
+                            enabled
+                                    ? "message.antarchy.ultimate_tool.mode_3x3"
+                                    : "message.antarchy.ultimate_tool.mode_default"
+                    ),
+                    true
+            );
         }
     }
 

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UtlimateShovelItem.java

@@ -44,7 +44,7 @@ public class UtlimateShovelItem extends ShovelItem {
     @Override
     public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
-        UltimateToolHelper.appendModeTooltip(UltimateToolHelper.ToolKind.SHOVEL, tooltipComponents);
+        UltimateToolHelper.appendThreeByThreeTooltip(tooltipComponents);
     }
 
     @Override

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/ants/TermiteNestFeature.java

@@ -34,8 +34,7 @@ public class TermiteNestFeature extends SurfaceAntNestFeature {
     protected BlockPos resolveNestPos(WorldGenLevel level, BlockPos origin) {
         int x = origin.getX();
         int z = origin.getZ();
-        // Start from the placement height so roofed dimensions like Cavaryn get nests on every cave layer, not just the top one.
-        int startY = Math.min(origin.getY(), level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z) - 1);
+        int startY = level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z) - 1;
         int minY = level.getMinBuildHeight() + 1;
 
         for (int y = startY; y >= minY; y--) {

common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/MantisClawWallClimbMixin.java

@@ -1,6 +1,5 @@
 package com.craisinlord.antarchy.mixins;
 
-import com.craisinlord.antarchy.content.AntarchyTags;
 import com.craisinlord.antarchy.content.item.MantisClawItem;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;
@@ -92,7 +91,6 @@ public abstract class MantisClawWallClimbMixin extends LivingEntity {
         Player player = (Player) (Object) this;
         return MantisClawItem.isDualWielding(player)
                 && this.horizontalCollision
-                && !this.level().dimensionTypeRegistration().is(AntarchyTags.DimensionTypes.NO_MANTIS_CLIMB)
                 && !this.onGround()
                 && !this.isInWaterOrBubble()
                 && !this.isPassenger()

common-1.21.1/src/main/resources/assets/antarchy/lang/de_de.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Auf 3x3-Abbau umgeschaltet",
-    "message.antarchy.ultimate_tool.mode_vein": "Auf Adernabbau umgeschaltet",
     "message.antarchy.ultimate_tool.mode_default": "Auf normalen Abbau umgeschaltet",
     "advancements.antarchy.hey_listen.title": "Hey, hör zu!",
     "advancements.antarchy.hey_listen.description": "Eine Reverie hat sich dir angeschlossen.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Rechtsklick, um dich drehend nach vorn zu bohren und Molevore-Blöcke zu durchdringen.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Rechtsklick, um in die Luft zu springen und mit einer Flächenschockwelle herabzustürzen.",
     "tooltip.antarchy.ultimate_tools_3x3": "Umschalt-Rechtsklick, um 3x3-Abbau umzuschalten.",
-    "tooltip.antarchy.ultimate_tools_vein": "Umschalt-Rechtsklick, um Adernabbau umzuschalten.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Umschalt-Rechtsklick wechselt zwischen 3x3-Abbau und Adernabbau.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Fällt ganze Bäume. Schleichen, um einen einzelnen Stamm zu hacken.",
     "tooltip.antarchy.moggles.reveal": "Gewährt Nachtsicht und weist auf nahe Höhlen hin.",
     "tooltip.antarchy.moggles.underground": "Funktioniert nur, wenn du keinen freien Blick zum Himmel hast.",
     "tooltip.antarchy.cornea_ear.vision": "Gewährt %s Sekunden lang Nachtsicht.",

common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json

@@ -801,7 +801,6 @@
     "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_vein":  "Switched to Vein 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.",
@@ -840,9 +839,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore":  "Use to spin forward and drill through Molevore blocks.",
     "tooltip.antarchy.big_bertha.mode.toreterror":  "Use to launch into the air and crash down with an AOE shockwave.",
     "tooltip.antarchy.ultimate_tools_3x3":  "Shift + use to toggle 3x3 Mining.",
-    "tooltip.antarchy.ultimate_tools_vein":  "Shift + use to toggle Vein Mining.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein":  "Shift + use to cycle 3x3 and Vein Mining.",
-    "tooltip.antarchy.battle_axe_tree_felling":  "Fells whole trees. Sneak to chop a single log.",
     "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.",

common-1.21.1/src/main/resources/assets/antarchy/lang/es_es.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Cambiado a minería 3x3",
-    "message.antarchy.ultimate_tool.mode_vein": "Cambiado a minería de vetas",
     "message.antarchy.ultimate_tool.mode_default": "Cambiado a minería normal",
     "advancements.antarchy.hey_listen.title": "¡Oye, escucha!",
     "advancements.antarchy.hey_listen.description": "Una Reverie se ha unido a ti.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Clic derecho para girar hacia delante y perforar bloques de Molevore.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Clic derecho para lanzarte al aire y caer con una onda de choque en área.",
     "tooltip.antarchy.ultimate_tools_3x3": "Mayús + clic derecho para alternar la minería 3x3.",
-    "tooltip.antarchy.ultimate_tools_vein": "Mayús + clic derecho para alternar la minería de vetas.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Mayús + clic derecho para alternar entre minería 3x3 y de vetas.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Tala árboles enteros. Agáchate para cortar un solo tronco.",
     "tooltip.antarchy.moggles.reveal": "Otorga Visión nocturna y señala cuevas cercanas.",
     "tooltip.antarchy.moggles.underground": "Solo funciona cuando no tienes acceso al cielo.",
     "tooltip.antarchy.cornea_ear.vision": "Otorga Visión nocturna durante %s segundos.",

common-1.21.1/src/main/resources/assets/antarchy/lang/fr_fr.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Mode minage 3x3 activé",
-    "message.antarchy.ultimate_tool.mode_vein": "Mode minage de filons activé",
     "message.antarchy.ultimate_tool.mode_default": "Mode minage normal activé",
     "advancements.antarchy.hey_listen.title": "Hé, écoute !",
     "advancements.antarchy.hey_listen.description": "Une Reverie vous a rejoint.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Clic droit pour tournoyer vers l’avant et forer les blocs de Molevore.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Clic droit pour bondir dans les airs et retomber avec une onde de choc de zone.",
     "tooltip.antarchy.ultimate_tools_3x3": "Maj + clic droit pour activer ou désactiver le minage 3x3.",
-    "tooltip.antarchy.ultimate_tools_vein": "Maj + clic droit pour activer ou désactiver le minage de filons.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Maj + clic droit pour alterner entre minage 3x3 et minage de filons.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Abat des arbres entiers. Accroupis-toi pour couper une seule bûche.",
     "tooltip.antarchy.moggles.reveal": "Accorde Vision nocturne et indique les grottes proches.",
     "tooltip.antarchy.moggles.underground": "Fonctionne uniquement lorsque vous n’avez pas accès au ciel.",
     "tooltip.antarchy.cornea_ear.vision": "Accorde Vision nocturne pendant %s secondes.",

common-1.21.1/src/main/resources/assets/antarchy/lang/it_it.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Scavo 3×3 attivato",
-    "message.antarchy.ultimate_tool.mode_vein": "Scavo di vene attivato",
     "message.antarchy.ultimate_tool.mode_default": "Scavo normale attivato",
     "advancements.antarchy.hey_listen.title": "Ehi, ascolta!",
     "advancements.antarchy.hey_listen.description": "Una Reverie si è unita a te.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Fai clic destro per ruotare in avanti e perforare i blocchi di Molevore.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Fai clic destro per balzare in aria e schiantarti con un’onda d’urto ad area.",
     "tooltip.antarchy.ultimate_tools_3x3": "Maiusc + clic destro per attivare o disattivare lo scavo 3×3.",
-    "tooltip.antarchy.ultimate_tools_vein": "Maiusc + clic destro per attivare o disattivare lo scavo di vene.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Maiusc + clic destro per alternare scavo 3×3 e scavo di vene.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Abbatte alberi interi. Accovacciati per tagliare un solo tronco.",
     "tooltip.antarchy.moggles.reveal": "Fornisce Visione notturna e indica le grotte vicine.",
     "tooltip.antarchy.moggles.underground": "Funziona solo quando non puoi vedere il cielo.",
     "tooltip.antarchy.cornea_ear.vision": "Conferisce Visione notturna per %s secondi.",

common-1.21.1/src/main/resources/assets/antarchy/lang/ja_jp.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "モールヴォア",
     "message.antarchy.big_bertha.mode.toreterror": "トアテラー",
     "message.antarchy.ultimate_tool.mode_3x3": "3×3採掘に切り替えました",
-    "message.antarchy.ultimate_tool.mode_vein": "鉱脈採掘に切り替えました",
     "message.antarchy.ultimate_tool.mode_default": "通常採掘に切り替えました",
     "advancements.antarchy.hey_listen.title": "ねえ、聞いて！",
     "advancements.antarchy.hey_listen.description": "レヴェリーが仲間になりました。",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "右クリックで回転しながら前進し、モールヴォアブロックを掘り抜きます。",
     "tooltip.antarchy.big_bertha.mode.toreterror": "右クリックで空中へ飛び上がり、範囲衝撃波とともに落下します。",
     "tooltip.antarchy.ultimate_tools_3x3": "シフトキー＋右クリックで3×3採掘を切り替えます。",
-    "tooltip.antarchy.ultimate_tools_vein": "シフトキー＋右クリックで鉱脈採掘を切り替えます。",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "シフトキー＋右クリックで3×3採掘と鉱脈採掘を切り替えます。",
-    "tooltip.antarchy.battle_axe_tree_felling": "木を丸ごと伐採します。スニーク中は原木を1つだけ切ります。",
     "tooltip.antarchy.moggles.reveal": "暗視を付与し、近くの洞窟を示します。",
     "tooltip.antarchy.moggles.underground": "空が見えない場所でのみ機能します。",
     "tooltip.antarchy.cornea_ear.vision": "%s秒間暗視を付与します。",

common-1.21.1/src/main/resources/assets/antarchy/lang/ko_kr.json

@@ -792,7 +792,6 @@
     "message.antarchy.big_bertha.mode.molevore":  "몰레보어",
     "message.antarchy.big_bertha.mode.toreterror":  "토레테러",
     "message.antarchy.ultimate_tool.mode_3x3":  "3x3 채굴 모드로 전환됨",
-    "message.antarchy.ultimate_tool.mode_vein":  "광맥 채굴 모드로 전환됨",
     "message.antarchy.ultimate_tool.mode_default":  "기본 채굴 모드로 전환됨",
     "advancements.antarchy.hey_listen.title":  "야, 들어봐!",
     "advancements.antarchy.hey_listen.description":  "레버리가 당신과 함께합니다.",
@@ -831,9 +830,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore":  "공격 시 추가 피해를 입히고 대상을 공중 높이 띄웁니다.",
     "tooltip.antarchy.big_bertha.mode.toreterror":  "사용하여 앞으로 회전하며 몰레보어 블록을 뚫고 나아갑니다.",
     "tooltip.antarchy.ultimate_tools_3x3":  "Shift + 사용: 3x3 채굴을 켜거나 끕니다.",
-    "tooltip.antarchy.ultimate_tools_vein":  "Shift + 사용: 광맥 채굴을 켜거나 끕니다.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein":  "Shift + 사용: 3x3 채굴과 광맥 채굴을 전환합니다.",
-    "tooltip.antarchy.battle_axe_tree_felling":  "나무 전체를 벱니다. 웅크리면 통나무 하나만 벱니다.",
     "tooltip.antarchy.moggles.reveal":  "야간 시야를 부여하고 근처 동굴을 가리킵니다.",
     "tooltip.antarchy.moggles.underground":  "하늘이 가려진 곳에서만 작동합니다.",
     "tooltip.antarchy.cornea_ear.vision":  "%s초 동안 야간 시야를 부여합니다.",

common-1.21.1/src/main/resources/assets/antarchy/lang/pt_br.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "Molevore",
     "message.antarchy.big_bertha.mode.toreterror": "Toreterror",
     "message.antarchy.ultimate_tool.mode_3x3": "Alternado para Mineração 3x3",
-    "message.antarchy.ultimate_tool.mode_vein": "Alternado para Mineração de Veios",
     "message.antarchy.ultimate_tool.mode_default": "Alternado para Mineração Padrão",
     "advancements.antarchy.hey_listen.title": "Ei, Escute!",
     "advancements.antarchy.hey_listen.description": "Uma Reverie se juntou a você.",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "Clique com o botão direito para girar para a frente e perfurar blocos de Molevore.",
     "tooltip.antarchy.big_bertha.mode.toreterror": "Clique com o botão direito para se lançar ao ar e cair com uma onda de choque em área.",
     "tooltip.antarchy.ultimate_tools_3x3": "Shift + clique com o botão direito para alternar a Mineração 3x3.",
-    "tooltip.antarchy.ultimate_tools_vein": "Shift + clique com o botão direito para alternar a Mineração de Veios.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "Shift + clique com o botão direito para alternar entre Mineração 3x3 e de Veios.",
-    "tooltip.antarchy.battle_axe_tree_felling": "Derruba árvores inteiras. Agache para cortar um único tronco.",
     "tooltip.antarchy.moggles.reveal": "Concede Visão Noturna e aponta para cavernas próximas.",
     "tooltip.antarchy.moggles.underground": "Funciona apenas quando você não tem acesso ao céu.",
     "tooltip.antarchy.cornea_ear.vision": "Concede Visão Noturna por %s segundos.",

common-1.21.1/src/main/resources/assets/antarchy/lang/ru_ru.json

@@ -488,7 +488,6 @@
     "message.antarchy.big_bertha.mode.molevore":  "Кротожор",
     "message.antarchy.big_bertha.mode.toreterror":  "Тортеррор",
     "message.antarchy.ultimate_tool.mode_3x3":  "Включено копание 3x3",
-    "message.antarchy.ultimate_tool.mode_vein":  "Включена добыча жил",
     "message.antarchy.ultimate_tool.mode_default":  "Включено обычное копание",
     "advancements.antarchy.hey_listen.title":  "Эй, послушай",
     "advancements.antarchy.hey_listen.description":  "К вам присоединилась грёза.",
@@ -521,9 +520,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore":  "ПКМ для рывка вперёд и бурения сквозь блоки кротожора.",
     "tooltip.antarchy.big_bertha.mode.toreterror":  "ПКМ запускает вас в воздух и обрушивает вниз с ударной волной по площади.",
     "tooltip.antarchy.ultimate_tools_3x3":  "Shift + ПКМ для переключения режима копания 3x3.",
-    "tooltip.antarchy.ultimate_tools_vein":  "Shift + ПКМ для переключения добычи жил.",
-    "tooltip.antarchy.ultimate_tools_3x3_vein":  "Shift + ПКМ переключает копание 3x3 и добычу жил.",
-    "tooltip.antarchy.battle_axe_tree_felling":  "Срубает дерево целиком. Присядьте, чтобы срубить одно бревно.",
     "tooltip.antarchy.moggles.reveal":  "Дают ночное зрение и указывают на ближайшие пещеры.",
     "tooltip.antarchy.moggles.underground":  "Работает только если над вами нет открытого неба.",
     "tooltip.antarchy.cornea_ear.vision":  "Даёт Ночное зрение на %s секунд.",

common-1.21.1/src/main/resources/assets/antarchy/lang/zh_cn.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "莫尔沃尔",
     "message.antarchy.big_bertha.mode.toreterror": "托尔泰罗尔",
     "message.antarchy.ultimate_tool.mode_3x3": "已切换至3×3挖掘",
-    "message.antarchy.ultimate_tool.mode_vein": "已切换至连锁挖矿",
     "message.antarchy.ultimate_tool.mode_default": "已切换至默认挖掘",
     "advancements.antarchy.hey_listen.title": "嘿，听着！",
     "advancements.antarchy.hey_listen.description": "一只雷弗里加入了你。",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "右键旋转向前并钻穿莫尔沃尔方块。",
     "tooltip.antarchy.big_bertha.mode.toreterror": "右键跃向空中并以范围冲击波砸落。",
     "tooltip.antarchy.ultimate_tools_3x3": "潜行键＋右键切换3×3挖掘。",
-    "tooltip.antarchy.ultimate_tools_vein": "潜行键＋右键切换连锁挖矿。",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "潜行键＋右键在3×3挖掘与连锁挖矿之间切换。",
-    "tooltip.antarchy.battle_axe_tree_felling": "一次砍倒整棵树。潜行时只砍一块原木。",
     "tooltip.antarchy.moggles.reveal": "获得夜视并指向附近洞穴。",
     "tooltip.antarchy.moggles.underground": "仅在无法接触天空时生效。",
     "tooltip.antarchy.cornea_ear.vision": "获得%s秒夜视。",

common-1.21.1/src/main/resources/assets/antarchy/lang/zh_tw.json

@@ -517,7 +517,6 @@
     "message.antarchy.big_bertha.mode.molevore": "莫爾沃爾",
     "message.antarchy.big_bertha.mode.toreterror": "托爾泰羅爾",
     "message.antarchy.ultimate_tool.mode_3x3": "已切換至3×3挖掘",
-    "message.antarchy.ultimate_tool.mode_vein": "已切換至連鎖挖礦",
     "message.antarchy.ultimate_tool.mode_default": "已切換至預設挖掘",
     "advancements.antarchy.hey_listen.title": "嘿，聽著！",
     "advancements.antarchy.hey_listen.description": "一隻雷弗里加入了你。",
@@ -550,9 +549,6 @@
     "tooltip.antarchy.big_bertha.mode.molevore": "右鍵旋轉向前並鑽穿莫爾沃爾方塊。",
     "tooltip.antarchy.big_bertha.mode.toreterror": "右鍵躍向空中並以範圍衝擊波砸落。",
     "tooltip.antarchy.ultimate_tools_3x3": "潛行鍵＋右鍵切換3×3挖掘。",
-    "tooltip.antarchy.ultimate_tools_vein": "潛行鍵＋右鍵切換連鎖挖礦。",
-    "tooltip.antarchy.ultimate_tools_3x3_vein": "潛行鍵＋右鍵在3×3挖掘與連鎖挖礦之間切換。",
-    "tooltip.antarchy.battle_axe_tree_felling": "一次砍倒整棵樹。潛行時只砍一塊原木。",
     "tooltip.antarchy.moggles.reveal": "獲得夜視並指向附近洞穴。",
     "tooltip.antarchy.moggles.underground": "僅在無法接觸天空時生效。",
     "tooltip.antarchy.cornea_ear.vision": "獲得%s秒夜視。",

common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/apple_cow.json

@@ -47,9 +47,6 @@
             {
               "function": "minecraft:furnace_smelt",
               "conditions": [
-                {
-                  "condition": "minecraft:any_of",
-                  "terms": [
                 {
                   "condition": "minecraft:entity_properties",
                   "entity": "this",
@@ -58,25 +55,6 @@
                       "is_on_fire": true
                     }
                   }
-                    },
-                    {
-                      "condition": "minecraft:entity_properties",
-                      "entity": "direct_attacker",
-                      "predicate": {
-                        "equipment": {
-                          "mainhand": {
-                            "predicates": {
-                              "minecraft:enchantments": [
-                                {
-                                  "enchantments": "#minecraft:smelts_loot"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      }
-                    }
-                  ]
                 }
               ]
             },

common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/enchanted_golden_apple_cow.json

@@ -47,9 +47,6 @@
             {
               "function": "minecraft:furnace_smelt",
               "conditions": [
-                {
-                  "condition": "minecraft:any_of",
-                  "terms": [
                 {
                   "condition": "minecraft:entity_properties",
                   "entity": "this",
@@ -58,25 +55,6 @@
                       "is_on_fire": true
                     }
                   }
-                    },
-                    {
-                      "condition": "minecraft:entity_properties",
-                      "entity": "direct_attacker",
-                      "predicate": {
-                        "equipment": {
-                          "mainhand": {
-                            "predicates": {
-                              "minecraft:enchantments": [
-                                {
-                                  "enchantments": "#minecraft:smelts_loot"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      }
-                    }
-                  ]
                 }
               ]
             },

common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/golden_apple_cow.json

@@ -47,9 +47,6 @@
             {
               "function": "minecraft:furnace_smelt",
               "conditions": [
-                {
-                  "condition": "minecraft:any_of",
-                  "terms": [
                 {
                   "condition": "minecraft:entity_properties",
                   "entity": "this",
@@ -58,25 +55,6 @@
                       "is_on_fire": true
                     }
                   }
-                    },
-                    {
-                      "condition": "minecraft:entity_properties",
-                      "entity": "direct_attacker",
-                      "predicate": {
-                        "equipment": {
-                          "mainhand": {
-                            "predicates": {
-                              "minecraft:enchantments": [
-                                {
-                                  "enchantments": "#minecraft:smelts_loot"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      }
-                    }
-                  ]
                 }
               ]
             },

common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/ouranwood_deer.json

@@ -47,9 +47,6 @@
             {
               "function": "minecraft:furnace_smelt",
               "conditions": [
-                {
-                  "condition": "minecraft:any_of",
-                  "terms": [
                 {
                   "condition": "minecraft:entity_properties",
                   "entity": "this",
@@ -58,25 +55,6 @@
                       "is_on_fire": true
                     }
                   }
-                    },
-                    {
-                      "condition": "minecraft:entity_properties",
-                      "entity": "direct_attacker",
-                      "predicate": {
-                        "equipment": {
-                          "mainhand": {
-                            "predicates": {
-                              "minecraft:enchantments": [
-                                {
-                                  "enchantments": "#minecraft:smelts_loot"
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      }
-                    }
-                  ]
                 }
               ]
             },

common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/cavaryn_moleworm_caves.json

@@ -55,8 +55,7 @@
     ],
     [
       "antarchy:moleworm_caves_creepvine",
-      "antarchy:moleworm_caves_hanging_creeproots",
-      "antarchy:termite_nest"
+      "antarchy:moleworm_caves_hanging_creeproots"
     ],
     []
   ],

common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/wormy_caves.json

@@ -52,8 +52,7 @@
       "antarchy:wormy_caves_creepvine",
       "antarchy:wormy_caves_hanging_creeproots",
       "antarchy:wormy_caves_molting_vines",
-      "antarchy:wormy_caves_ground_molting_vines",
-      "antarchy:termite_nest"
+      "antarchy:wormy_caves_ground_molting_vines"
     ],
     []
   ],

common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/red_ant_nest.json

@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 8
+      "chance": 24
     },
     {
       "type": "minecraft:in_square"

common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/red_ant_nest_magma.json

@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 8
+      "chance": 24
     },
     {
       "type": "minecraft:in_square"

common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json

@@ -3,22 +3,14 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 24
+      "chance": 88
     },
     {
       "type": "minecraft:in_square"
     },
     {
-      "type": "minecraft:height_range",
-      "height": {
-        "type": "minecraft:uniform",
-        "min_inclusive": {
-          "absolute": 8
-        },
-        "max_inclusive": {
-          "absolute": 190
-        }
-      }
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
     },
     {
       "type": "minecraft:biome"

common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest_cavaryn.json

@@ -3,22 +3,14 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 16
+      "chance": 44
     },
     {
       "type": "minecraft:in_square"
     },
     {
-      "type": "minecraft:height_range",
-      "height": {
-        "type": "minecraft:uniform",
-        "min_inclusive": {
-          "absolute": 8
-        },
-        "max_inclusive": {
-          "absolute": 190
-        }
-      }
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
     },
     {
       "type": "minecraft:biome"

forge-1.20.1/gradle.properties

@@ -6,7 +6,7 @@ mod_name=Antarchy
 mod_description=ANTS! ANTS! ANTS! ANTS!
 mod_authors=CraisinLord
 mod_group_id=com.craisinlord
-mod_version=2.2.9
+mod_version=2.2.6
 mod_license=All Rights Reserved
 
 minecraft_version=1.20.1

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyConfigModuleForge.java

@@ -154,7 +154,6 @@ public final class AntarchyConfigModuleForge {
         AntarchySettings.setRoyalBossKnockbackResistance(AntarchyMobsConfig.royalBossKnockbackResistance());
         AntarchySettings.setRoyalBossStepHeight(AntarchyMobsConfig.royalBossStepHeight());
         AntarchySettings.setRoyalBossMaxSingleHitDamage(AntarchyMobsConfig.royalBossMaxSingleHitDamage());
-        AntarchySettings.setRoyalBossHitOverflowRate(AntarchyMobsConfig.royalBossHitOverflowRate());
         AntarchySettings.setRoyalBossBiteReach(AntarchyMobsConfig.royalBossBiteReach());
         AntarchySettings.setRoyalBossBiteDamageMultiplier(AntarchyMobsConfig.royalBossBiteDamageMultiplier());
         AntarchySettings.setRoyalBossBiteCooldownTicks(AntarchyMobsConfig.royalBossBiteCooldownTicks());
@@ -440,9 +439,6 @@ public final class AntarchyConfigModuleForge {
         AntarchySettings.setUltimateHoeAttackSpeed(AntarchyToolsConfig.ultimateHoeAttackSpeed());
         AntarchySettings.setUltimateToolEnchantability(AntarchyToolsConfig.ultimateToolEnchantability());
         AntarchySettings.setUltimateToolsThreeByThreeEnabled(AntarchyToolsConfig.ultimateToolsThreeByThreeEnabled());
-        AntarchySettings.setUltimateToolsVeinMiningEnabled(AntarchyToolsConfig.ultimateToolsVeinMiningEnabled());
-        AntarchySettings.setUltimateToolsVeinMiningMaxBlocks(AntarchyToolsConfig.ultimateToolsVeinMiningMaxBlocks());
-        AntarchySettings.setUltimateToolsTreeFellingMaxLogs(AntarchyToolsConfig.ultimateToolsTreeFellingMaxLogs());
 
         AntarchySettings.setUltimateBowAttackDamage(AntarchyToolsConfig.ultimateBowAttackDamage());
         AntarchySettings.setUltimateBowPlayerHeal(AntarchyToolsConfig.ultimateBowPlayerHeal());

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMobsConfig.java

@@ -104,7 +104,6 @@ public final class AntarchyMobsConfig {
     private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_KNOCKBACK_RESISTANCE;
     private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_STEP_HEIGHT;
     private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE;
-    private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_HIT_OVERFLOW_RATE;
     private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_BITE_REACH;
     private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER;
     private static final ForgeConfigSpec.IntValue ROYAL_BOSS_BITE_COOLDOWN_TICKS;
@@ -532,7 +531,6 @@ public final class AntarchyMobsConfig {
         ROYAL_BOSS_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance shared by King and Queen.").defineInRange("knockbackResistance", 1.0D, 0.0D, 1.0D);
         ROYAL_BOSS_STEP_HEIGHT = b.comment("Base step height shared by King and Queen.").defineInRange("stepHeight", 3.0D, 0.0D, 32.0D);
         ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE = b.comment("Maximum damage a single hit can deal to a Royal boss before later anti-burst systems are added.").defineInRange("maxSingleHitDamage", 250.0D, 1.0D, 32768.0D);
-        ROYAL_BOSS_HIT_OVERFLOW_RATE = b.comment("Share of damage above maxSingleHitDamage that still lands. 0 makes the cap a hard limit.").defineInRange("hitOverflowRate", 0.25D, 0.0D, 1.0D);
         ROYAL_BOSS_BITE_REACH = b.comment("Radius around each head anchor that a King or Queen bite can hit.").defineInRange("biteReach", 12.0D, 1.0D, 64.0D);
         ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER = b.comment("Multiplier applied to base attack damage for King and Queen head bites.").defineInRange("biteDamageMultiplier", 1.6D, 0.0D, 32.0D);
         ROYAL_BOSS_BITE_COOLDOWN_TICKS = b.comment("Base cooldown in ticks between bites for a single King or Queen head (scaled down at later phases).").defineInRange("biteCooldownTicks", 45, 1, 1200);
@@ -1048,7 +1046,6 @@ public final class AntarchyMobsConfig {
     static double  royalBossKnockbackResistance()           { return ROYAL_BOSS_KNOCKBACK_RESISTANCE.get(); }
     static double  royalBossStepHeight()                    { return ROYAL_BOSS_STEP_HEIGHT.get(); }
     static double  royalBossMaxSingleHitDamage()            { return ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE.get(); }
-    static double  royalBossHitOverflowRate()               { return ROYAL_BOSS_HIT_OVERFLOW_RATE.get(); }
     static double  royalBossBiteReach()                     { return ROYAL_BOSS_BITE_REACH.get(); }
     static double  royalBossBiteDamageMultiplier()          { return ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER.get(); }
     static int     royalBossBiteCooldownTicks()             { return ROYAL_BOSS_BITE_COOLDOWN_TICKS.get(); }

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyToolsConfig.java

@@ -22,9 +22,6 @@ public final class AntarchyToolsConfig {
     private static final ForgeConfigSpec.DoubleValue  ULTIMATE_HOE_ATTACK_SPEED;
     private static final ForgeConfigSpec.IntValue     ULTIMATE_TOOL_ENCHANTABILITY;
     private static final ForgeConfigSpec.BooleanValue ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED;
-    private static final ForgeConfigSpec.BooleanValue ULTIMATE_TOOLS_VEIN_MINING_ENABLED;
-    private static final ForgeConfigSpec.IntValue     ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS;
-    private static final ForgeConfigSpec.IntValue     ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS;
 
     private static final ForgeConfigSpec.DoubleValue  ULTIMATE_BOW_ATTACK_DAMAGE;
     private static final ForgeConfigSpec.DoubleValue  ULTIMATE_BOW_PLAYER_HEAL;
@@ -251,11 +248,6 @@ public final class AntarchyToolsConfig {
         ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED = b
                 .comment("If false, Ultimate pickaxe, axe, shovel, and hoe lose their 3x3 mining mode and tooltip.")
                 .define("threeByThreeEnabled", true);
-        ULTIMATE_TOOLS_VEIN_MINING_ENABLED = b
-                .comment("If false, the Ultimate Pickaxe and Axe lose Vein Mining and the Battle Axe stops felling trees.")
-                .define("veinMiningEnabled", true);
-        ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS  = b.comment("Most extra blocks the Ultimate Pickaxe or Axe breaks in one Vein Mining swing. Logs use treeFellingMaxLogs instead.").defineInRange("veinMiningMaxBlocks", 64, 1, 1024);
-        ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS = b.comment("Most extra logs broken at once by Vein Mining on logs or by the Battle Axe.")          .defineInRange("treeFellingMaxLogs", 128, 1, 1024);
         b.pop();
 
         b.push("ultimateBow");
@@ -582,9 +574,6 @@ public final class AntarchyToolsConfig {
     static double  ultimateHoeAttackSpeed()                  { return ULTIMATE_HOE_ATTACK_SPEED.get(); }
     static int     ultimateToolEnchantability()              { return ULTIMATE_TOOL_ENCHANTABILITY.get(); }
     static boolean ultimateToolsThreeByThreeEnabled()        { return ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED.get(); }
-    static boolean ultimateToolsVeinMiningEnabled()          { return ULTIMATE_TOOLS_VEIN_MINING_ENABLED.get(); }
-    static int     ultimateToolsVeinMiningMaxBlocks()          { return ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS.get(); }
-    static int     ultimateToolsTreeFellingMaxLogs()         { return ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS.get(); }
 
     static double  ultimateBowAttackDamage()                 { return ULTIMATE_BOW_ATTACK_DAMAGE.get(); }
     static double  ultimateBowPlayerHeal()                   { return ULTIMATE_BOW_PLAYER_HEAL.get(); }

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/client/AntarchyKeyBindings.java

@@ -36,21 +36,6 @@ public final class AntarchyKeyBindings {
             InputConstants.KEY_R,
             CATEGORY
     );
-    public static final KeyMapping MOUNT_BEAM = new KeyMapping(
-            "key.antarchy.mount_beam",
-            KeyConflictContext.IN_GAME,
-            InputConstants.Type.KEYSYM,
-            InputConstants.KEY_H,
-            CATEGORY
-    );
-
-    public static final KeyMapping MOUNT_SIGNATURE = new KeyMapping(
-            "key.antarchy.mount_signature",
-            KeyConflictContext.IN_GAME,
-            InputConstants.Type.KEYSYM,
-            InputConstants.KEY_J,
-            CATEGORY
-    );
     public static final KeyMapping TIGERS_EYE_CAMOUFLAGE = new KeyMapping(
             "key.antarchy.tigers_eye_camouflage",
             KeyConflictContext.IN_GAME,
@@ -95,8 +80,6 @@ public final class AntarchyKeyBindings {
         event.register(BRUTALFLY_FLAP);
         event.register(MOUNT_SPECIAL);
         event.register(MOUNT_FLIGHT_TOGGLE);
-        event.register(MOUNT_BEAM);
-        event.register(MOUNT_SIGNATURE);
         event.register(TIGERS_EYE_CAMOUFLAGE);
         event.register(ROYAL_INVERSION_TOGGLE);
         event.register(ROYAL_BOUNDARY);
@@ -108,14 +91,6 @@ public final class AntarchyKeyBindings {
         return MOUNT_FLIGHT_TOGGLE.isDown();
     }
 
-    public static boolean isMountBeamPressed() {
-        return MOUNT_BEAM.isDown();
-    }
-
-    public static boolean isMountSignaturePressed() {
-        return MOUNT_SIGNATURE.isDown();
-    }
-
     public static boolean isMountSpecialPressed() {
         return MOUNT_SPECIAL.isDown();
     }

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/client/RoyalMountClientHandler.java

@@ -18,8 +18,6 @@ public final class RoyalMountClientHandler {
     private static boolean wasAttack;
     private static boolean wasSpecial;
     private static boolean wasFlightToggle;
-    private static boolean wasBeam;
-    private static boolean wasSignature;
     private static boolean wasAscend;
     private static boolean wasDescend;
     private static boolean wasUse;
@@ -67,18 +65,6 @@ public final class RoyalMountClientHandler {
         }
         wasFlightToggle = flightToggle;
 
-        boolean beam = AntarchyKeyBindings.isMountBeamPressed();
-        if (beam && !wasBeam) {
-            AntarchyForgeNetworkCore.sendToServer(new RoyalMountActionPayload(RoyalMountActionPayload.BEAM));
-        }
-        wasBeam = beam;
-
-        boolean signature = AntarchyKeyBindings.isMountSignaturePressed();
-        if (signature && !wasSignature) {
-            AntarchyForgeNetworkCore.sendToServer(new RoyalMountActionPayload(RoyalMountActionPayload.SIGNATURE));
-        }
-        wasSignature = signature;
-
         boolean ascend = mc.options.keyJump.isDown();
         boolean descend = mc.options.keyShift.isDown();
         if (ascend != wasAscend || descend != wasDescend) {
@@ -95,8 +81,6 @@ public final class RoyalMountClientHandler {
         wasAttack = false;
         wasSpecial = false;
         wasFlightToggle = false;
-        wasBeam = false;
-        wasSignature = false;
         wasAscend = false;
         wasDescend = false;
     }

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/registry/AntarchyForgePayloadHandlers.java

@@ -102,8 +102,6 @@ public class AntarchyForgePayloadHandlers {
                         case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.FLIGHT_TOGGLE -> mount.toggleMountedFlight(player);
                         case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.BITE -> mount.handleMountedBite(player);
                         case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.SPIT -> mount.handleMountedSpit(player);
-                        case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.BEAM -> mount.handleMountedBeam(player);
-                        case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.SIGNATURE -> mount.handleMountedSignature(player);
                         default -> {
                         }
                     }

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.configureondemand=true
 minecraft_version_1_21_1=1.21.1
 modid=antarchy
 mod_id=antarchy
-mod_version=2.2.9
+mod_version=2.2.6
 maven_group=com.craisinlord
 mixin_version=0.15.4+mixin.0.8.7
 

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java

@@ -154,7 +154,6 @@ public final class AntarchyConfigModuleNeoforge {
         AntarchySettings.setRoyalBossKnockbackResistance(AntarchyMobsConfig.royalBossKnockbackResistance());
         AntarchySettings.setRoyalBossStepHeight(AntarchyMobsConfig.royalBossStepHeight());
         AntarchySettings.setRoyalBossMaxSingleHitDamage(AntarchyMobsConfig.royalBossMaxSingleHitDamage());
-        AntarchySettings.setRoyalBossHitOverflowRate(AntarchyMobsConfig.royalBossHitOverflowRate());
         AntarchySettings.setRoyalBossBiteReach(AntarchyMobsConfig.royalBossBiteReach());
         AntarchySettings.setRoyalBossBiteDamageMultiplier(AntarchyMobsConfig.royalBossBiteDamageMultiplier());
         AntarchySettings.setRoyalBossBiteCooldownTicks(AntarchyMobsConfig.royalBossBiteCooldownTicks());
@@ -440,9 +439,6 @@ public final class AntarchyConfigModuleNeoforge {
         AntarchySettings.setUltimateHoeAttackSpeed(AntarchyToolsConfig.ultimateHoeAttackSpeed());
         AntarchySettings.setUltimateToolEnchantability(AntarchyToolsConfig.ultimateToolEnchantability());
         AntarchySettings.setUltimateToolsThreeByThreeEnabled(AntarchyToolsConfig.ultimateToolsThreeByThreeEnabled());
-        AntarchySettings.setUltimateToolsVeinMiningEnabled(AntarchyToolsConfig.ultimateToolsVeinMiningEnabled());
-        AntarchySettings.setUltimateToolsVeinMiningMaxBlocks(AntarchyToolsConfig.ultimateToolsVeinMiningMaxBlocks());
-        AntarchySettings.setUltimateToolsTreeFellingMaxLogs(AntarchyToolsConfig.ultimateToolsTreeFellingMaxLogs());
 
         AntarchySettings.setUltimateBowAttackDamage(AntarchyToolsConfig.ultimateBowAttackDamage());
         AntarchySettings.setUltimateBowPlayerHeal(AntarchyToolsConfig.ultimateBowPlayerHeal());

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java

@@ -128,7 +128,6 @@ public final class AntarchyMobsConfig {
     private static final ModConfigSpec.DoubleValue ROYAL_BOSS_KNOCKBACK_RESISTANCE;
     private static final ModConfigSpec.DoubleValue ROYAL_BOSS_STEP_HEIGHT;
     private static final ModConfigSpec.DoubleValue ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE;
-    private static final ModConfigSpec.DoubleValue ROYAL_BOSS_HIT_OVERFLOW_RATE;
     private static final ModConfigSpec.DoubleValue ROYAL_BOSS_BITE_REACH;
     private static final ModConfigSpec.DoubleValue ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER;
     private static final ModConfigSpec.IntValue ROYAL_BOSS_BITE_COOLDOWN_TICKS;
@@ -643,7 +642,6 @@ public final class AntarchyMobsConfig {
         ROYAL_BOSS_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance shared by King and Queen.").defineInRange("knockbackResistance", 1.0D, 0.0D, 1.0D);
         ROYAL_BOSS_STEP_HEIGHT = b.comment("Base step height shared by King and Queen.").defineInRange("stepHeight", 3.0D, 0.0D, 32.0D);
         ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE = b.comment("Maximum damage a single hit can deal to a Royal boss before later anti-burst systems are added.").defineInRange("maxSingleHitDamage", 250.0D, 1.0D, 32768.0D);
-        ROYAL_BOSS_HIT_OVERFLOW_RATE = b.comment("Share of damage above maxSingleHitDamage that still lands. 0 makes the cap a hard limit.").defineInRange("hitOverflowRate", 0.25D, 0.0D, 1.0D);
         ROYAL_BOSS_BITE_REACH = b.comment("Radius around each head anchor that a King or Queen bite can hit.").defineInRange("biteReach", 12.0D, 1.0D, 64.0D);
         ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER = b.comment("Multiplier applied to base attack damage for King and Queen head bites.").defineInRange("biteDamageMultiplier", 1.6D, 0.0D, 32.0D);
         ROYAL_BOSS_BITE_COOLDOWN_TICKS = b.comment("Base cooldown in ticks between bites for a single King or Queen head (scaled down at later phases).").defineInRange("biteCooldownTicks", 45, 1, 1200);
@@ -1197,7 +1195,6 @@ public final class AntarchyMobsConfig {
     static double  royalBossKnockbackResistance()           { return ROYAL_BOSS_KNOCKBACK_RESISTANCE.get(); }
     static double  royalBossStepHeight()                    { return ROYAL_BOSS_STEP_HEIGHT.get(); }
     static double  royalBossMaxSingleHitDamage()            { return ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE.get(); }
-    static double  royalBossHitOverflowRate()               { return ROYAL_BOSS_HIT_OVERFLOW_RATE.get(); }
     static double  royalBossBiteReach()                     { return ROYAL_BOSS_BITE_REACH.get(); }
     static double  royalBossBiteDamageMultiplier()          { return ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER.get(); }
     static int     royalBossBiteCooldownTicks()             { return ROYAL_BOSS_BITE_COOLDOWN_TICKS.get(); }

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyToolsConfig.java

@@ -28,9 +28,6 @@ public final class AntarchyToolsConfig {
     private static final ModConfigSpec.DoubleValue  ULTIMATE_HOE_ATTACK_SPEED;
     private static final ModConfigSpec.IntValue     ULTIMATE_TOOL_ENCHANTABILITY;
     private static final ModConfigSpec.BooleanValue ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED;
-    private static final ModConfigSpec.BooleanValue ULTIMATE_TOOLS_VEIN_MINING_ENABLED;
-    private static final ModConfigSpec.IntValue     ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS;
-    private static final ModConfigSpec.IntValue     ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS;
 
 
     // Ultimate Bow
@@ -309,11 +306,6 @@ public final class AntarchyToolsConfig {
         ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED = b
                 .comment("If false, Ultimate pickaxe, axe, shovel, and hoe lose their 3x3 mining mode and tooltip.")
                 .define("threeByThreeEnabled", true);
-        ULTIMATE_TOOLS_VEIN_MINING_ENABLED = b
-                .comment("If false, the Ultimate Pickaxe and Axe lose Vein Mining and the Battle Axe stops felling trees.")
-                .define("veinMiningEnabled", true);
-        ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS  = b.comment("Most extra blocks the Ultimate Pickaxe or Axe breaks in one Vein Mining swing. Logs use treeFellingMaxLogs instead.").defineInRange("veinMiningMaxBlocks", 64, 1, 1024);
-        ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS = b.comment("Most extra logs broken at once by Vein Mining on logs or by the Battle Axe.")          .defineInRange("treeFellingMaxLogs", 128, 1, 1024);
         b.pop();
 
 
@@ -680,9 +672,6 @@ public final class AntarchyToolsConfig {
     static double  ultimateHoeAttackSpeed()                  { return ULTIMATE_HOE_ATTACK_SPEED.get(); }
     static int     ultimateToolEnchantability()              { return ULTIMATE_TOOL_ENCHANTABILITY.get(); }
     static boolean ultimateToolsThreeByThreeEnabled()        { return ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED.get(); }
-    static boolean ultimateToolsVeinMiningEnabled()          { return ULTIMATE_TOOLS_VEIN_MINING_ENABLED.get(); }
-    static int     ultimateToolsVeinMiningMaxBlocks()          { return ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS.get(); }
-    static int     ultimateToolsTreeFellingMaxLogs()         { return ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS.get(); }
 
     static double  ultimateBowAttackDamage()                 { return ULTIMATE_BOW_ATTACK_DAMAGE.get(); }
     static double  ultimateBowPlayerHeal()                   { return ULTIMATE_BOW_PLAYER_HEAL.get(); }

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/mixins/infinity/ShaderPayloadRepeatSkipMixin.java

@@ -1,32 +0,0 @@
-package com.craisinlord.antarchy.neoforge.mixins.infinity;
-
-import net.codexarchonic.infinity.registry.payload.s2c.ShaderS2CPayload;
-import net.codexarchonic.infinity.util.loading.ShaderLoader;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.nbt.CompoundTag;
-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.Redirect;
-
-import java.lang.ref.WeakReference;
-
-@Mixin(value = ShaderS2CPayload.class, remap = false)
-public class ShaderPayloadRepeatSkipMixin {
-    @Unique
-    private static WeakReference<ClientLevel> antarchy$lastEmptyLevel = new WeakReference<>(null);
-
-    @Redirect(method = "lambda$receive$0", at = @At(value = "INVOKE",
-            target = "Lnet/codexarchonic/infinity/util/loading/ShaderLoader;reloadShaders(Lnet/minecraft/client/Minecraft;Lnet/minecraft/nbt/CompoundTag;Z)V"),
-            remap = false)
-    private void antarchy$skipRepeatedEmptyReload(Minecraft minecraft, CompoundTag shader, boolean iridescence) {
-        boolean empty = shader.isEmpty() && !iridescence;
-        ClientLevel level = minecraft.level;
-        if (empty && level != null && antarchy$lastEmptyLevel.get() == level) {
-            return;
-        }
-        antarchy$lastEmptyLevel = new WeakReference<>(empty ? level : null);
-        ShaderLoader.reloadShaders(minecraft, shader, iridescence);
-    }
-}

neoforge-1.21.1/src/main/resources/antarchy-neoforge.mixins.json

@@ -15,7 +15,6 @@
     "infinity.WarpLogicMixin"
   ],
   "client": [
-    "infinity.ShaderPayloadRepeatSkipMixin"
   ],
   "injectors": {
     "defaultRequire": 1