fix(mixin): printTpsInfoWhenCantKeepUp & removeBats mixin problems

Author: OptiJava

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/printTpsInfoWhenCantKeepUp/MinecraftServer_Mixin.java

@@ -9,8 +9,8 @@
 //$$ import net.minecraft.util.TimeHelper;
 //#else
 import carpet.helpers.TickSpeed;
-//#endif
 import net.minecraft.util.math.MathHelper;
+//#endif
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -21,7 +21,11 @@ public class MinecraftServer_Mixin {
 
     @Inject(
             method = "runServer",
+            //#if MC >= 12004
+            //$$ at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", shift = At.Shift.AFTER),
+            //#else
             at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", shift = At.Shift.AFTER),
+            //#endif
             remap = false
     )
     private void injectRunServer(CallbackInfo ci) {
@@ -30,9 +34,9 @@ private void injectRunServer(CallbackInfo ci) {
 
         if (OptCarpetSettings.printTpsInfoWhenCantKeepUp) {
             //#if MC >= 12004
-            //$$ double mspt = (double)CarpetServer.minecraft_server.getAverageNanosPerTick() / (double) TimeHelper.MILLI_IN_NANOS;
+            //$$ double mspt = (double) CarpetServer.minecraft_server.getAverageNanosPerTick() / (double) TimeHelper.MILLI_IN_NANOS;
             //$$ ServerTickManager trm = CarpetServer.minecraft_server.getTickManager();
-            //$$ double tps = 1000.0 / Math.max(trm.isSprinting() ? 0.0 : (double)trm.getMillisPerTick(), mspt);
+            //$$ double tps = 1000.0 / Math.max(trm.isSprinting() ? 0.0 : (double) trm.getMillisPerTick(), mspt);
             //$$ if (trm.isFrozen()) {
             //$$     tps = 0.0;
             //$$ }

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeBats/BatEntity_Mixin.java

@@ -20,7 +20,11 @@ public class BatEntity_Mixin {
             at = @At("HEAD"),
             cancellable = true
     )
+    //#if MC >= 12004
+    //$$ private static void injectCanSpawn(EntityType<BatEntity> type, WorldAccess world, SpawnReason spawnReason, BlockPos pos, net.minecraft.util.math.random.Random random, CallbackInfoReturnable<Boolean> cir) {
+    //#else
     private static void injectCanSpawn(EntityType<BatEntity> type, WorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random, CallbackInfoReturnable<Boolean> cir) {
+    //#endif
         if (OptCarpetSettings.removeBats) {
             cir.setReturnValue(false);
             cir.cancel();