Update 1.21 (#365)

.github/workflows/gradle.yml

@@ -34,9 +34,9 @@ jobs:
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest-1.20.6"
+          automatic_release_tag: "latest-1.21"
           prerelease: false
-          title: "1.20.6 Build"
+          title: "1.21 Build"
           files: |
             ./build/libs/*.jar
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 }
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21

gradle.properties

@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.20.6
-yarn_version=1.20.6+build.1
+minecraft_version=1.21
+yarn_version=1.21+build.2
 loader_version=0.15.11
 
 # Mod Properties
 mod_version = 0.3
 maven_group = anticope.rejects
 archives_base_name = meteor-rejects-addon
 
-meteor_version=0.5.7
-baritone_version=1.20.4
+meteor_version=0.5.8
+baritone_version=1.20.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/anticope/rejects/arguments/ClientPosArgumentType.java

@@ -13,7 +13,6 @@
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.util.math.Vec3d;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 

src/main/java/anticope/rejects/commands/CenterCommand.java

@@ -6,9 +6,6 @@
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.util.math.MathHelper;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class CenterCommand extends Command {
     public CenterCommand() {
         super("center", "Centers the player on a block.");

src/main/java/anticope/rejects/commands/ClearChatCommand.java

@@ -4,9 +4,6 @@
 import meteordevelopment.meteorclient.commands.Command;
 import net.minecraft.command.CommandSource;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class ClearChatCommand extends Command {
     public ClearChatCommand() {
         super("clear-chat", "Clears your chat.", "clear", "cls");

src/main/java/anticope/rejects/commands/GhostCommand.java

@@ -9,9 +9,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class GhostCommand extends Command {
     public GhostCommand() {
         super("ghost", "Remove ghost blocks & bypass AntiXray", "aax", "anti-anti-xray");

src/main/java/anticope/rejects/commands/HeadsCommand.java

@@ -7,8 +7,6 @@
 import meteordevelopment.meteorclient.utils.Utils;
 import net.minecraft.command.CommandSource;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-
 public class HeadsCommand extends Command {
 
     public HeadsCommand() {

src/main/java/anticope/rejects/commands/KickCommand.java

@@ -11,9 +11,6 @@
 import net.minecraft.text.Text;
 import org.apache.commons.lang3.SystemUtils;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class KickCommand extends Command {
 
     public KickCommand() {

src/main/java/anticope/rejects/commands/LocateCommand.java

@@ -19,9 +19,6 @@
 import cubitect.Cubiomes;
 import cubitect.Cubiomes.Pos;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class LocateCommand extends Command {
 
 	private final static DynamicCommandExceptionType NOT_FOUND = new DynamicCommandExceptionType(o -> {

src/main/java/anticope/rejects/commands/PanicCommand.java

@@ -8,8 +8,6 @@
 
 import java.util.ArrayList;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-
 public class PanicCommand extends Command {
     public PanicCommand() {
         super("panic", "Disables all modules.", "disable-all");

src/main/java/anticope/rejects/commands/ReconnectCommand.java

@@ -9,9 +9,6 @@
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.command.CommandSource;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class ReconnectCommand extends Command {
     public ReconnectCommand() {
         super("reconnect", "Reconnects server.");

src/main/java/anticope/rejects/commands/SaveSkinCommand.java

@@ -23,8 +23,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-
 public class SaveSkinCommand extends Command {
 
     private final static SimpleCommandExceptionType IO_EXCEPTION = new SimpleCommandExceptionType(Text.literal("An exception occurred"));

src/main/java/anticope/rejects/commands/SeedCommand.java

@@ -13,8 +13,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-
 public class SeedCommand extends Command {
     private final static SimpleCommandExceptionType NO_SEED = new SimpleCommandExceptionType(Text.literal("No seed for current world saved."));
 

src/main/java/anticope/rejects/commands/ServerCommand.java

@@ -20,9 +20,6 @@
 import java.net.UnknownHostException;
 import java.util.*;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 /*
     Ported from Cornos
     https://github.com/cornos/Cornos/blob/master/src/main/java/me/zeroX150/cornos/features/command/impl/Scan.java

src/main/java/anticope/rejects/commands/SetBlockCommand.java

@@ -10,9 +10,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class SetBlockCommand extends Command {
     public SetBlockCommand() {
         super("setblock", "Sets client side blocks", "sblk");

src/main/java/anticope/rejects/commands/SetVelocityCommand.java

@@ -5,9 +5,6 @@
 import meteordevelopment.meteorclient.commands.Command;
 import net.minecraft.command.CommandSource;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class SetVelocityCommand extends Command {
     public SetVelocityCommand() {
         super("set-velocity", "Sets player velocity", "velocity", "vel");

src/main/java/anticope/rejects/commands/TeleportCommand.java

@@ -7,9 +7,6 @@
 import net.minecraft.command.CommandSource;
 import net.minecraft.util.math.Vec3d;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class TeleportCommand extends Command {
 
 

src/main/java/anticope/rejects/commands/TerrainExport.java

@@ -16,9 +16,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 public class TerrainExport extends Command {
 
     private final static SimpleCommandExceptionType IO_EXCEPTION = new SimpleCommandExceptionType(Text.literal("An IOException occurred"));

src/main/java/anticope/rejects/gui/screens/InteractionScreen.java

@@ -62,7 +62,7 @@ public class InteractionScreen extends Screen {
     private final Map<String, Consumer<Entity>> functions;
     private final Map<String, String> msgs;
 
-    private final Identifier GUI_ICONS_TEXTURE = new Identifier("textures/gui/icons.png");
+    private final Identifier GUI_ICONS_TEXTURE = Identifier.of("textures/gui/icons.png");
 
     private final StaticListener shiftListener = new StaticListener();
 

src/main/java/anticope/rejects/mixin/ClientCommonNetwokHandlerMixin.java

@@ -4,6 +4,7 @@
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.utils.player.ChatUtils;
 import net.minecraft.client.network.ClientCommonNetworkHandler;
+import net.minecraft.network.DisconnectionInfo;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -15,11 +16,11 @@
 @Mixin(ClientCommonNetworkHandler.class)
 public class ClientCommonNetwokHandlerMixin {
 	@Inject(method = "onDisconnected", at = @At("HEAD"), cancellable = true)
-	private void onDisconnected(Text reason, CallbackInfo info) {
+	private void onDisconnected(DisconnectionInfo info, CallbackInfo ci) {
 		if (Modules.get().isActive(SilentDisconnect.class) && mc.world != null && mc.player != null) {
 			ChatUtils.info(Text.translatable("disconnect.lost").getString() + ":");
-			ChatUtils.sendMsg(reason);
-			info.cancel();
+			ChatUtils.sendMsg(info.reason());
+			ci.cancel();
 		}
 	}
 }

src/main/java/anticope/rejects/mixin/CommandSuggestorMixin.java

@@ -5,7 +5,6 @@
 import meteordevelopment.meteorclient.systems.modules.render.NoRender;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ChatInputSuggestor;
-import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

src/main/java/anticope/rejects/mixin/GameRendererMixin.java

@@ -4,6 +4,7 @@
 import meteordevelopment.meteorclient.systems.modules.Modules;
 
 import net.minecraft.client.gl.PostEffectProcessor;
+import net.minecraft.client.render.RenderTickCounter;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -19,14 +20,14 @@ public class GameRendererMixin {
     @Shadow @Final MinecraftClient client;
 
     @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;drawEntityOutlinesFramebuffer()V", ordinal = 0))
-	private void renderShader(float tickDelta, long startTime, boolean tick, CallbackInfo ci) {
+	private void renderShader(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci) {
         Rendering renderingModule = Modules.get().get(Rendering.class);
         if (renderingModule == null) return;
         PostEffectProcessor shader = renderingModule.getShaderEffect();
 
         if (shader != null) {
             shader.setupDimensions(client.getWindow().getFramebufferWidth(), client.getWindow().getFramebufferHeight());
-			shader.render(tickDelta);
+			shader.render(tickCounter.getTickDelta(tick));
         }
     }
 }

src/main/java/anticope/rejects/modules/AutoCraft.java

@@ -10,7 +10,6 @@
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.client.gui.screen.recipebook.RecipeResultCollection;
 import net.minecraft.item.Item;
-import net.minecraft.recipe.Recipe;
 import net.minecraft.recipe.RecipeEntry;
 import net.minecraft.screen.CraftingScreenHandler;
 import net.minecraft.screen.slot.SlotActionType;

src/main/java/anticope/rejects/modules/AutoExtinguish.java

@@ -83,7 +83,7 @@ public class AutoExtinguish extends Module {
     private BlockPos blockPos = null;
     private boolean doesWaterBucketWork = true;
 
-    private static final StatusEffect FIRE_RESISTANCE = Registries.STATUS_EFFECT.get(new Identifier("fire_resistance"));
+    private static final StatusEffect FIRE_RESISTANCE = Registries.STATUS_EFFECT.get(Identifier.of("fire_resistance"));
 
     public AutoExtinguish() {
         super(MeteorRejectsAddon.CATEGORY, "auto-extinguish", "Automatically extinguishes fire around you");

src/main/java/anticope/rejects/modules/AutoGrind.java

@@ -13,10 +13,13 @@
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.registry.tag.EnchantmentTags;
 import net.minecraft.screen.GrindstoneScreenHandler;
 
 import java.util.List;
+import java.util.Set;
 
 public class AutoGrind extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -38,7 +41,7 @@ public class AutoGrind extends Module {
             .build()
     );
 
-    private final Setting<List<Enchantment>> enchantmentBlacklist = sgGeneral.add(new EnchantmentListSetting.Builder()
+    private final Setting<Set<RegistryKey<Enchantment>>> enchantmentBlacklist = sgGeneral.add(new EnchantmentListSetting.Builder()
             .name("enchantment-blacklist")
             .description("Enchantments that should be ignored.")
             .defaultValue()
@@ -80,7 +83,7 @@ private boolean canGrind(ItemStack stack) {
 
         for (RegistryEntry<Enchantment> enchantment : enchantments.getEnchantments()) {
             availEnchs++;
-            if (enchantment.value().isCursed())
+            if (EnchantmentHelper.hasAnyEnchantmentsIn(stack, EnchantmentTags.CURSE))
                 availEnchs--;
             if (enchantmentBlacklist.get().contains(enchantment.value()))
                 return false;

src/main/java/anticope/rejects/modules/AutoSoup.java

@@ -14,15 +14,17 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.passive.TameableEntity;
 import net.minecraft.entity.passive.VillagerEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.item.StewItem;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 
+import java.util.List;
+
 public class AutoSoup extends Module {
     private static final String desc = "Automatically eats soup when your health is low on some servers.";
 
@@ -108,10 +110,12 @@ private void onTick(TickEvent.Post event) {
     }
 
     private int findSoup(int startSlot, int endSlot) {
+        List<Item> stews = List.of(Items.RABBIT_STEW, Items.MUSHROOM_STEW, Items.BEETROOT_SOUP);
+
         for (int i = startSlot; i < endSlot; i++) {
             ItemStack stack = mc.player.getInventory().getStack(i);
 
-            if (stack != null && stack.getItem() instanceof StewItem)
+            if (stack != null && stews.contains(stack.getItem()))
                 return i;
         }
 

src/main/java/anticope/rejects/modules/BungeeCordSpoof.java

@@ -9,7 +9,6 @@
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.orbit.EventHandler;
-import net.minecraft.network.NetworkState;
 import net.minecraft.network.packet.c2s.handshake.ConnectionIntent;
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
 

src/main/java/anticope/rejects/modules/NoJumpDelay.java

@@ -4,13 +4,8 @@
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.mixin.LivingEntityAccessor;
 import meteordevelopment.orbit.EventHandler;
-import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.Module;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class NoJumpDelay extends Module {
 
     public NoJumpDelay() {

src/main/java/anticope/rejects/modules/Rendering.java

@@ -106,7 +106,7 @@ public void onChanged(Shader s) {
         if (s == Shader.Vibrant) name = "color_convolve";
         else if (s == Shader.Scanline) name = "scan_pincushion";
         else name = s.toString().toLowerCase();
-        Identifier shaderID = new Identifier(String.format("shaders/post/%s.json", name));
+        Identifier shaderID = Identifier.of(String.format("shaders/post/%s.json", name));
         try {
             PostEffectProcessor shader = new PostEffectProcessor(mc.getTextureManager(), mc.getResourceManager(), mc.getFramebuffer(), shaderID);
             this.shader = shader;