Fix compatibility for Minecraft 1.21.10

kafoby · kafoby · commit ffc733fb5f20 · 2026-01-13T19:35:23.000-05:00
diff --git a/gradle.properties b/gradle.properties
@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.21.11
-yarn_version=1.21.11+build.3
+minecraft_version=1.21.10
+yarn_version=1.21.10+build.3
 loader_version=0.17.3
 
 # Mod Properties
 mod_version = 0.3
 maven_group = anticope.rejects
 archives_base_name = meteor-rejects-addon
 
-baritone_version=1.21.11
+baritone_version=1.21.10
diff --git a/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java b/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java
@@ -23,10 +23,10 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.animal.equine.AbstractHorse;
+import net.minecraft.world.entity.animal.horse.AbstractHorse;
 import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.vehicle.minecart.AbstractMinecartContainer;
+import net.minecraft.world.entity.vehicle.AbstractMinecartContainer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import org.meteordev.starscript.compiler.Compiler;
@@ -56,7 +56,7 @@ public class InteractionScreen extends Screen {
     private final Map<String, Consumer<Entity>> functions;
     private final Map<String, String> msgs;
 
-    private final net.minecraft.resources.Identifier GUI_ICONS_TEXTURE = net.minecraft.resources.Identifier.parse("textures/gui/icons.png");
+    private final net.minecraft.resources.ResourceLocation GUI_ICONS_TEXTURE = net.minecraft.resources.ResourceLocation.parse("textures/gui/icons.png");
 
     private final StaticListener shiftListener = new StaticListener();
 
diff --git a/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java b/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java
@@ -286,7 +286,6 @@ public WWidget module(Module module) {
         return w(new WMeteorModule(module, module.title));
     }
 
-    @Override
     public WWidget module(Module module, String title) {
         return w(new WMeteorModule(module, title));
     }
@@ -387,7 +386,6 @@ public boolean categoryIcons() {
         return categoryIcons.get();
     }
 
-    @Override
     public boolean hideHUD() {
         return hideHUD.get();
     }
diff --git a/src/main/java/anticope/rejects/modules/AntiSpawnpoint.java b/src/main/java/anticope/rejects/modules/AntiSpawnpoint.java
@@ -10,9 +10,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.attribute.BedRule;
-import net.minecraft.world.attribute.EnvironmentAttributeMap;
-import net.minecraft.world.attribute.EnvironmentAttributes;
 import net.minecraft.world.level.block.BedBlock;
 import net.minecraft.world.level.block.Blocks;
 
@@ -38,24 +35,23 @@ private void onSendPacket(PacketEvent.Send event) {
 
 
         BlockPos blockPos = ((ServerboundUseItemOnPacket) event.packet).getHitResult().getBlockPos();
-        EnvironmentAttributeMap attributes = mc.level.dimensionType().attributes();
-        boolean IsOverWorld = attributes.applyModifier(EnvironmentAttributes.BED_RULE, BedRule.CAN_SLEEP_WHEN_DARK) != BedRule.CAN_SLEEP_WHEN_DARK;
-        boolean IsNetherWorld = attributes.applyModifier(EnvironmentAttributes.RESPAWN_ANCHOR_WORKS, false);
+        boolean bedDangerous = !mc.level.dimensionType().bedWorks();
+        boolean anchorWorks = mc.level.dimensionType().respawnAnchorWorks();
         boolean BlockIsBed = mc.level.getBlockState(blockPos).getBlock() instanceof BedBlock;
         boolean BlockIsAnchor = mc.level.getBlockState(blockPos).getBlock().equals(Blocks.RESPAWN_ANCHOR);
 
         assert mc.player != null;
         if (fakeUse.get()) {
-            if (BlockIsBed && IsOverWorld) {
+            if (BlockIsBed && bedDangerous) {
                 mc.player.swing(InteractionHand.MAIN_HAND);
                 mc.player.absSnapTo(blockPos.getX(),blockPos.above().getY(),blockPos.getZ());
             }
-            else if (BlockIsAnchor && IsNetherWorld) {
+            else if (BlockIsAnchor && anchorWorks) {
                 mc.player.swing(InteractionHand.MAIN_HAND);
             }
         }
 
-        if((BlockIsBed && IsOverWorld)||(BlockIsAnchor && IsNetherWorld)) {
+        if((BlockIsBed && bedDangerous)||(BlockIsAnchor && anchorWorks)) {
             event.cancel();
         }
     }
diff --git a/src/main/java/anticope/rejects/modules/AutoExtinguish.java b/src/main/java/anticope/rejects/modules/AutoExtinguish.java
@@ -15,9 +15,9 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.attribute.EnvironmentAttributes;
+// import net.minecraft.world.attribute.EnvironmentAttributes; // Removed
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -83,15 +83,15 @@ public class AutoExtinguish extends Module {
     private BlockPos blockPos = null;
     private boolean doesWaterBucketWork = true;
 
-    private static final MobEffect FIRE_RESISTANCE = BuiltInRegistries.MOB_EFFECT.getValue(Identifier.parse("fire_resistance"));
+    private static final MobEffect FIRE_RESISTANCE = BuiltInRegistries.MOB_EFFECT.get(net.minecraft.resources.ResourceLocation.parse("fire_resistance")).get().value();
 
     public AutoExtinguish() {
         super(MeteorRejectsAddon.CATEGORY, "auto-extinguish", "Automatically extinguishes fire around you");
     }
 
     @EventHandler
     private void onTick(TickEvent.Pre event) {
-        if (mc.level.dimensionType().attributes().applyModifier(EnvironmentAttributes.RESPAWN_ANCHOR_WORKS, false)) {
+        if (mc.level.dimensionType().respawnAnchorWorks()) {
             if (doesWaterBucketWork) {
                 warning("Water Buckets don't work in this dimension!");
                 doesWaterBucketWork = false;
@@ -118,8 +118,8 @@ private void onTick(TickEvent.Pre event) {
                 blockPos = mc.player.blockPosition();
                 final int slot = findSlot(Items.WATER_BUCKET);
                 if (mc.level.getBlockState(blockPos).getBlock() == Blocks.FIRE || mc.level.getBlockState(blockPos).getBlock() == Blocks.SOUL_FIRE) {
-                    float yaw = mc.gameRenderer.getMainCamera().yRot() % 360;
-                    float pitch = mc.gameRenderer.getMainCamera().xRot() % 360;
+                    float yaw = mc.gameRenderer.getMainCamera().getYRot() % 360;
+                    float pitch = mc.gameRenderer.getMainCamera().getXRot() % 360;
                     if (center.get()) {
                         PlayerUtils.centerPlayer();
                     }
@@ -155,8 +155,8 @@ private void place(int slot) {
                 PlayerUtils.centerPlayer();
             }
             mc.player.getInventory().setSelectedSlot(slot);
-            float yaw = mc.gameRenderer.getMainCamera().yRot() % 360;
-            float pitch = mc.gameRenderer.getMainCamera().xRot() % 360;
+            float yaw = mc.gameRenderer.getMainCamera().getYRot() % 360;
+            float pitch = mc.gameRenderer.getMainCamera().getXRot() % 360;
 
             Rotations.rotate(yaw, 90);
             mc.gameMode.useItem(mc.player, InteractionHand.MAIN_HAND);
diff --git a/src/main/java/anticope/rejects/modules/AutoSoup.java b/src/main/java/anticope/rejects/modules/AutoSoup.java
@@ -12,7 +12,7 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.TamableAnimal;
-import net.minecraft.world.entity.npc.villager.Villager;
+import net.minecraft.world.entity.npc.Villager;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
diff --git a/src/main/java/anticope/rejects/modules/BoatGlitch.java b/src/main/java/anticope/rejects/modules/BoatGlitch.java
@@ -14,7 +14,7 @@
 import net.minecraft.network.protocol.game.ServerboundInteractPacket;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.vehicle.boat.Boat;
+import net.minecraft.world.entity.vehicle.Boat;
 
 public class BoatGlitch extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
diff --git a/src/main/java/anticope/rejects/modules/BoatPhase.java b/src/main/java/anticope/rejects/modules/BoatPhase.java
@@ -11,7 +11,7 @@
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.utils.player.PlayerUtils;
 import meteordevelopment.orbit.EventHandler;
-import net.minecraft.world.entity.vehicle.boat.Boat;
+import net.minecraft.world.entity.vehicle.Boat;
 import net.minecraft.world.phys.Vec3;
 
 public class BoatPhase extends Module {
diff --git a/src/main/java/anticope/rejects/modules/KnockbackPlus.java b/src/main/java/anticope/rejects/modules/KnockbackPlus.java
@@ -16,7 +16,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.phys.Vec3;
-import org.jspecify.annotations.NonNull;
+
 
 public class KnockbackPlus extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -37,11 +37,11 @@ private void onSendPacket(PacketEvent.Send event) {
         if (event.packet instanceof ServerboundInteractPacket packet) {
             packet.dispatch(new ServerboundInteractPacket.Handler() {
                 @Override
-                public void onInteraction(@NonNull InteractionHand interactionHand) {
+                public void onInteraction(InteractionHand interactionHand) {
                 }
 
                 @Override
-                public void onInteraction(@NonNull InteractionHand interactionHand, @NonNull Vec3 vec3) {
+                public void onInteraction(InteractionHand interactionHand, Vec3 vec3) {
                 }
 
                 @Override
diff --git a/src/main/java/anticope/rejects/modules/ObsidianFarm.java b/src/main/java/anticope/rejects/modules/ObsidianFarm.java
@@ -10,7 +10,6 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.attribute.EnvironmentAttributes;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Blocks;
 import java.util.ArrayList;
@@ -36,7 +35,7 @@ private void onTick(TickEvent.Post event) {
         if (mc.player == null) return;
         if (mc.level == null) return;
         if (mc.gameMode == null) return;
-        if (mc.level.dimensionType().attributes().applyModifier(EnvironmentAttributes.RESPAWN_ANCHOR_WORKS, false)) {
+        if (mc.level.dimensionType().respawnAnchorWorks()) {
             allowBreakAgain = true;
             return;
         }
diff --git a/src/main/java/anticope/rejects/modules/Rendering.java b/src/main/java/anticope/rejects/modules/Rendering.java
@@ -8,7 +8,7 @@
 import meteordevelopment.meteorclient.systems.modules.Module;
 import net.minecraft.client.renderer.LevelTargetBundle;
 import net.minecraft.client.renderer.PostChain;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 
 public class Rendering extends Module {
 
@@ -89,7 +89,7 @@ public void onChanged(Shader s) {
             return;
         }
 
-        Identifier shaderID = Identifier.withDefaultNamespace(name);
+        ResourceLocation shaderID = ResourceLocation.withDefaultNamespace(name);
         this.shader = mc.getShaderManager().getPostChain(shaderID, LevelTargetBundle.MAIN_TARGETS);
     }
 
diff --git a/src/main/java/anticope/rejects/modules/ShieldBypass.java b/src/main/java/anticope/rejects/modules/ShieldBypass.java
@@ -88,7 +88,7 @@ public void bypass(Entity target, Cancellable event) {
 
             mc.getConnection().send(ServerboundInteractPacket.createAttackPacket(e, mc.player.isShiftKeyDown()));
             mc.getConnection().send(new ServerboundSwingPacket(mc.player.getUsedItemHand()));
-            mc.player.resetOnlyAttackStrengthTicker();
+            mc.player.resetAttackStrengthTicker();
 
             mc.getConnection().send(new ServerboundMovePlayerPacket.Pos(mc.player.getX(), mc.player.getY(), mc.player.getZ(), true, mc.player.horizontalCollision));
         }
diff --git a/src/main/java/anticope/rejects/modules/SoundLocator.java b/src/main/java/anticope/rejects/modules/SoundLocator.java
@@ -22,6 +22,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import net.minecraft.core.registries.BuiltInRegistries;
+
 public class SoundLocator extends Module {
 
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -113,7 +115,7 @@ private void onPlaySound(PlaySoundEvent event) {
         if(whitelist.get()) {
             // Whitelist ON
             for (SoundEvent sound : sounds.get()) {
-                if (sound.location().equals(event.sound.getIdentifier())) {
+                if (BuiltInRegistries.SOUND_EVENT.getKey(sound).equals(event.sound.getLocation())) {
                     printSound(event.sound);
                     break;
                 }
@@ -125,7 +127,7 @@ private void onPlaySound(PlaySoundEvent event) {
     }
 
     private void printSound(SoundInstance sound) {
-        WeighedSoundEvents soundSet = mc.getSoundManager().getSoundEvent(sound.getIdentifier());
+        WeighedSoundEvents soundSet = mc.getSoundManager().getSoundEvent(sound.getLocation());
 
         Vec3 pos = new Vec3(sound.getX() - 0.5, sound.getY() - 0.5, sound.getZ() - 0.5);
         if(!renderPos.contains(pos)) {
@@ -135,7 +137,7 @@ private void printSound(SoundInstance sound) {
             if(chatActive.get()) {
                 MutableComponent text;
                 if (soundSet == null || soundSet.getSubtitle() == null) {
-                    text = Component.literal(sound.getIdentifier().toString());
+                    text = Component.literal(sound.getLocation().toString());
                 } else {
                     text = soundSet.getSubtitle().copy();
                 }
diff --git a/src/main/java/anticope/rejects/modules/VehicleOneHit.java b/src/main/java/anticope/rejects/modules/VehicleOneHit.java
@@ -9,8 +9,8 @@
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.network.protocol.game.ServerboundInteractPacket;
-import net.minecraft.world.entity.vehicle.boat.Boat;
-import net.minecraft.world.entity.vehicle.minecart.AbstractMinecart;
+import net.minecraft.world.entity.vehicle.Boat;
+import net.minecraft.world.entity.vehicle.AbstractMinecart;
 import net.minecraft.world.phys.EntityHitResult;
 
 public class VehicleOneHit extends Module {
diff --git a/src/main/java/anticope/rejects/utils/GiveUtils.java b/src/main/java/anticope/rejects/utils/GiveUtils.java
@@ -12,7 +12,7 @@
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.item.Item;
@@ -43,14 +43,14 @@ public class GiveUtils {
     private final static SimpleCommandExceptionType NOT_IN_CREATIVE = new SimpleCommandExceptionType(Component.literal("You must be in creative mode to use this."));
     private final static SimpleCommandExceptionType NO_SPACE = new SimpleCommandExceptionType(Component.literal("No space in hotbar."));
 
-    private static final List<Identifier> HIDDEN_ENTITIES = Arrays.asList(
-        Identifier.parse("giant"),
-        Identifier.parse("ender_dragon"),
-        Identifier.parse("wither"),
-        Identifier.parse("iron_golem"),
-        Identifier.parse("ender_dragon"),
-        Identifier.parse("tnt_minecart"),
-        Identifier.parse("lightning_bolt"));
+    private static final List<ResourceLocation> HIDDEN_ENTITIES = Arrays.asList(
+        ResourceLocation.parse("giant"),
+        ResourceLocation.parse("ender_dragon"),
+        ResourceLocation.parse("wither"),
+        ResourceLocation.parse("iron_golem"),
+        ResourceLocation.parse("ender_dragon"),
+        ResourceLocation.parse("tnt_minecart"),
+        ResourceLocation.parse("lightning_bolt"));
 
     // Some ported from: https://github.com/BleachDrinker420/BleachHack/blob/master/BleachHack-Fabric-1.16/src/main/java/bleach/hack/command/commands/CmdGive.java
     private static final List<Triple<String, Item, String>> ENTITY_PRESETS = Arrays.asList(
@@ -89,7 +89,7 @@ public static void giveItem(ItemStack item) throws CommandSyntaxException {
                 try {
                     CompoundTag compound = TagParser.parseCompoundFully(preset.getRight());
                     String entityId = compound.getString("id").orElse("minecraft:pig");
-                    net.minecraft.world.entity.EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.getValue(Identifier.parse(entityId));
+                    net.minecraft.world.entity.EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.getValue(ResourceLocation.parse(entityId));
                     item.set(DataComponents.ENTITY_DATA, net.minecraft.world.item.component.TypedEntityData.of(entityType, compound));
                 } catch (CommandSyntaxException e) { }
                 item.set(DataComponents.CUSTOM_NAME, Component.literal(toName(preset.getLeft())));
@@ -104,7 +104,7 @@ public static void giveItem(ItemStack item) throws CommandSyntaxException {
                 try {
                     CompoundTag compound = TagParser.parseCompoundFully(preset.getRight());
                     String blockEntityId = compound.getString("id").orElse("minecraft:spawner");
-                    net.minecraft.world.level.block.entity.BlockEntityType<?> blockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE.getValue(Identifier.parse(blockEntityId));
+                    net.minecraft.world.level.block.entity.BlockEntityType<?> blockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE.getValue(ResourceLocation.parse(blockEntityId));
                     item.set(DataComponents.BLOCK_ENTITY_DATA, net.minecraft.world.item.component.TypedEntityData.of(blockEntityType, compound));
                 } catch (CommandSyntaxException e) { }
                 item.set(DataComponents.CUSTOM_NAME, Component.literal(toName(preset.getLeft())));
diff --git a/src/main/java/anticope/rejects/utils/WorldGenUtils.java b/src/main/java/anticope/rejects/utils/WorldGenUtils.java
@@ -20,17 +20,17 @@
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.animal.golem.IronGolem;
+import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.monster.Blaze;
 import net.minecraft.world.entity.monster.ElderGuardian;
 import net.minecraft.world.entity.monster.Guardian;
 import net.minecraft.world.entity.monster.Shulker;
 import net.minecraft.world.entity.monster.Slime;
-import net.minecraft.world.entity.monster.illager.Evoker;
+import net.minecraft.world.entity.monster.Evoker;
 import net.minecraft.world.entity.monster.piglin.PiglinBrute;
-import net.minecraft.world.entity.monster.skeleton.WitherSkeleton;
-import net.minecraft.world.entity.npc.villager.Villager;
-import net.minecraft.world.entity.vehicle.minecart.MinecartChest;
+import net.minecraft.world.entity.monster.WitherSkeleton;
+import net.minecraft.world.entity.npc.Villager;
+import net.minecraft.world.entity.vehicle.MinecartChest;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.component.MapDecorations;
diff --git a/src/main/java/anticope/rejects/utils/server/LegacyServerPinger.java b/src/main/java/anticope/rejects/utils/server/LegacyServerPinger.java
@@ -5,7 +5,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.multiplayer.ServerStatusPinger;
-import net.minecraft.server.network.EventLoopGroupHolder;
 
 public class LegacyServerPinger {
     private static final AtomicInteger threadNumber = new AtomicInteger(0);
@@ -29,7 +28,7 @@ private void pingInCurrentThread(String ip, int port) {
         MeteorRejectsAddon.LOG.info("Pinging {}:{}...", ip, port);
 
         try {
-            pinger.pingServer(server, () -> {}, () -> {}, EventLoopGroupHolder.remote(false));
+            pinger.pingServer(server, () -> {}, () -> {});
             MeteorRejectsAddon.LOG.info("Ping successful: {}:{}", ip, port);
 
         } catch (UnknownHostException e) {
diff --git a/src/main/java/anticope/rejects/utils/server/ServerListPinger.java b/src/main/java/anticope/rejects/utils/server/ServerListPinger.java

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,6 @@ public WWidget module(Module module) {`
`286`	`286`	`return w(new WMeteorModule(module, module.title));`
`287`	`287`	`}`
`288`	`288`
`289`		`- @Override`
`290`	`289`	`public WWidget module(Module module, String title) {`
`291`	`290`	`return w(new WMeteorModule(module, title));`
`292`	`291`	`}`
`@@ -387,7 +386,6 @@ public boolean categoryIcons() {`
`387`	`386`	`return categoryIcons.get();`
`388`	`387`	`}`
`389`	`388`
`390`		`- @Override`
`391`	`389`	`public boolean hideHUD() {`
`392`	`390`	`return hideHUD.get();`
`393`	`391`	`}`