2.2.6

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.4
+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/client/QueenMusicClientHandler.java

@@ -18,6 +18,6 @@ public final class QueenMusicClientHandler {
     public static void onClientTick(TickEvent.ClientTickEvent event) {
         if (event.phase != TickEvent.Phase.END) return;
         Minecraft minecraft = Minecraft.getInstance();
-        QueenMusicHandler.tick(minecraft, AntarchyForgeSounds.THE_QUEEN.get());
+        QueenMusicHandler.tick(minecraft, AntarchyForgeSounds.THE_QUEEN);
     }
 }

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/mixins/compat/DroneFakePlayerConstructionMixin.java

@@ -0,0 +1,49 @@
+package com.craisinlord.antarchy.forge.mixins.compat;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.common.util.FakePlayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+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.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+/** Protects virtual position calls made before the drone constructor has finished. */
+@Pseudo
+@Mixin(targets = "me.desht.pneumaticcraft.common.util.fakeplayer.DroneFakePlayer", remap = false)
+public abstract class DroneFakePlayerConstructionMixin extends FakePlayer {
+    @Unique
+    private boolean antarchy$droneConstructionComplete;
+
+    protected DroneFakePlayerConstructionMixin(ServerLevel level, GameProfile profile) {
+        super(level, profile);
+    }
+
+    @Inject(method = "<init>", at = @At("RETURN"), remap = false)
+    private void antarchy$finishDroneConstruction(CallbackInfo ci) {
+        antarchy$droneConstructionComplete = true;
+    }
+
+    // Explicit Mojmap/SRG selectors: the optional target is unavailable to the
+    // annotation processor, but its Minecraft overrides are reobfuscated by Forge.
+    @Inject(method = {"position()Lnet/minecraft/world/phys/Vec3;", "m_20182_()Lnet/minecraft/world/phys/Vec3;"},
+            at = @At("HEAD"), cancellable = true, remap = false, require = 0)
+    private void antarchy$positionDuringConstruction(CallbackInfoReturnable<Vec3> cir) {
+        if (!antarchy$droneConstructionComplete) {
+            cir.setReturnValue(super.position());
+        }
+    }
+
+    @Inject(method = {"blockPosition()Lnet/minecraft/core/BlockPos;", "m_20183_()Lnet/minecraft/core/BlockPos;"},
+            at = @At("HEAD"), cancellable = true, remap = false, require = 0)
+    private void antarchy$blockPositionDuringConstruction(CallbackInfoReturnable<BlockPos> cir) {
+        if (!antarchy$droneConstructionComplete) {
+            cir.setReturnValue(super.blockPosition());
+        }
+    }
+}

forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/mixins/infinity/AmendmentRareOresMixin.java

@@ -24,5 +24,11 @@ public class AmendmentRareOresMixin {
                 new Amendment.MatchingBlockTagSelector("antarchy:infinity_dimension_rare_ores"),
                 new Amendment.SetValue(0.02)
         ));
+        data.computeIfAbsent(ConfigType.EFFECTS, k -> new ArrayList<>()).add(new Amendment(
+                ConfigType.EFFECTS,
+                new Amendment.MatchingModSelector("antarchy"),
+                new Amendment.MatchingSelector("antarchy:paralyzed"),
+                new Amendment.SetValue(0.0)
+        ));
     }
 }

forge-1.20.1/src/main/resources/antarchy-forge.mixins.json

@@ -4,6 +4,7 @@
   "refmap": "antarchy-forge.mixins.refmap.json",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
+    "compat.DroneFakePlayerConstructionMixin",
     "compat.SablePhysicsColliderBlockGetterMixin",
     "item.BucketItemThoraxisWaterMixin",
     "entity.ParalyzedMobFreezeMixin",