diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/commands/ListAdvanceCommand.java b/src/main/java/io/github/optijava/opt_carpet_addition/commands/ListAdvanceCommand.java index ffabeb9..d69a4f9 100644 --- a/src/main/java/io/github/optijava/opt_carpet_addition/commands/ListAdvanceCommand.java +++ b/src/main/java/io/github/optijava/opt_carpet_addition/commands/ListAdvanceCommand.java @@ -24,7 +24,7 @@ private static int listAdvance(CommandContext context) { MinecraftServer minecraftServer = context.getSource().getServer(); StringBuilder sb = new StringBuilder(); for (ServerPlayerEntity s : minecraftServer.getPlayerManager().getPlayerList()) { - //#if MC >= 12000 + //#if MC >= 12004 //$$ sb.append(s.getName().getString()).append(" ").append(s.interactionManager.getGameMode().getName()).append(" ").append(s.networkHandler.getLatency()).append("ms ").append(s.getIp()).append(" ").append(s.getGameProfile().getId().toString()).append("\n"); //#else sb.append(s.getName().getString()).append(" ").append(s.interactionManager.getGameMode().getName()).append(" ").append(s.pingMilliseconds).append("ms ").append(s.getIp()).append(" ").append(s.getGameProfile().getId().toString()).append("\n"); diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeBats/BatEntity_Mixin.java b/src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeBats/BatEntity_Mixin.java index 594711d..35720cc 100644 --- a/src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeBats/BatEntity_Mixin.java +++ b/src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeBats/BatEntity_Mixin.java @@ -11,9 +11,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -//#if MC < 11900 import java.util.Random; -//#endif @Mixin(BatEntity.class) public class BatEntity_Mixin { @@ -22,7 +20,9 @@ public class BatEntity_Mixin { at = @At("HEAD"), cancellable = true ) - //#if MC >= 11900 + //#if MC == 12001 + //$$ private static void injectCanSpawn(EntityType type, WorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random, CallbackInfoReturnable cir) { + //#elseif MC >= 11900 //$$ private static void injectCanSpawn(EntityType type, WorldAccess world, SpawnReason spawnReason, BlockPos pos, net.minecraft.util.math.random.Random random, CallbackInfoReturnable cir) { //#else private static void injectCanSpawn(EntityType type, WorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random, CallbackInfoReturnable cir) {