basic 1.21.10 and 1.21.11 support, for people who need it (#486)

Co-authored-by: Cloudburst <[email protected]>

Author: CraftingDragon007

.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.21.4"
+          automatic_release_tag: "latest-1.21.11"
           prerelease: false
-          title: "1.21.4 Build"
+          title: "1.21.11 Build"
           files: |
             ./build/libs/*.jar
 

build.gradle

@@ -1,10 +1,17 @@
 plugins {
-	id 'fabric-loom' version '1.9-SNAPSHOT'
+	id 'java'
+	id 'fabric-loom' version '1.14-SNAPSHOT'
 }
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
+}
 
-archivesBaseName = project.archives_base_name
+base {
+	archivesName = project.archives_base_name
+}
 version = project.mod_version
 group = project.maven_group
 
@@ -36,7 +43,7 @@ dependencies {
 	extraLibs('dev.duti.acheong:cubiomes:1.22.3:windows64') { transitive = false }
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_version}:v2"
+	mappings loom.officialMojangMappings()
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	modImplementation("meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT")
@@ -71,13 +78,13 @@ processResources {
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}" }
+		rename { "${it}_${base.archivesName}" }
 	}
 	from {
 		configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }
 	}
 }
-tasks.withType(Jar) {
+tasks.withType(Jar).configureEach {
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.21.4
-yarn_version=1.21.4+build.8
-loader_version=0.16.9
+minecraft_version=1.21.11
+yarn_version=1.21.11+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.4
+baritone_version=1.21.11

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/anticope/rejects/MeteorRejectsAddon.java

@@ -14,13 +14,13 @@
 import meteordevelopment.meteorclient.systems.modules.Category;
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.item.Items;
+import net.minecraft.world.item.Items;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MeteorRejectsAddon extends MeteorAddon {
     public static final Logger LOG = LoggerFactory.getLogger("Rejects");
-    public static final Category CATEGORY = new Category("Rejects", Items.BARRIER.getDefaultStack());
+    public static final Category CATEGORY = new Category("Rejects", Items.BARRIER.getDefaultInstance());
     public static final HudGroup HUD_GROUP = new HudGroup("Rejects");
 
     @Override

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

@@ -6,65 +6,64 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.command.CommandSource;
-import net.minecraft.command.argument.CoordinateArgument;
-import net.minecraft.command.argument.Vec3ArgumentType;
-import net.minecraft.server.command.CommandManager;
-import net.minecraft.util.math.Vec3d;
-
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
+import net.minecraft.client.Minecraft;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.commands.arguments.coordinates.Vec3Argument;
+import net.minecraft.commands.arguments.coordinates.WorldCoordinate;
+import net.minecraft.world.phys.Vec3;
 
-public class ClientPosArgumentType implements ArgumentType<Vec3d> {
-    private static final MinecraftClient mc = MinecraftClient.getInstance();
+public class ClientPosArgumentType implements ArgumentType<Vec3> {
+    private static final Minecraft mc = Minecraft.getInstance();
 
     public static ClientPosArgumentType pos() {
         return new ClientPosArgumentType();
     }
 
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        if (!(context.getSource() instanceof CommandSource)) {
+        if (!(context.getSource() instanceof SharedSuggestionProvider)) {
             return Suggestions.empty();
         } else {
             String string = builder.getRemaining();
-            Collection<CommandSource.RelativePosition> collection2 = ((CommandSource)context.getSource()).getBlockPositionSuggestions();
+            Collection<SharedSuggestionProvider.TextCoordinates> collection2 = ((SharedSuggestionProvider)context.getSource()).getRelevantCoordinates();
 
-            return CommandSource.suggestPositions(string, collection2, builder, CommandManager.getCommandValidator(this::parse));
+            return SharedSuggestionProvider.suggestCoordinates(string, collection2, builder, Commands.createValidator(this::parse));
         }
     }
 
-    public static Vec3d getPos(final CommandContext<?> context, final String name) {
-        return context.getArgument(name, Vec3d.class);
+    public static Vec3 getPos(final CommandContext<?> context, final String name) {
+        return context.getArgument(name, Vec3.class);
     }
 
 
-    public Vec3d parse(StringReader reader) throws CommandSyntaxException {
+    public Vec3 parse(StringReader reader) throws CommandSyntaxException {
         int i = reader.getCursor();
         double x,y,z;
-        CoordinateArgument coordinateArgument = CoordinateArgument.parse(reader);
-        CoordinateArgument coordinateArgument2;
-        CoordinateArgument coordinateArgument3;
+        WorldCoordinate coordinateArgument = WorldCoordinate.parseInt(reader);
+        WorldCoordinate coordinateArgument2;
+        WorldCoordinate coordinateArgument3;
         if (reader.canRead() && reader.peek() == ' ') {
             reader.skip();
-            coordinateArgument2 = CoordinateArgument.parse(reader);
+            coordinateArgument2 = WorldCoordinate.parseInt(reader);
             if (reader.canRead() && reader.peek() == ' ') {
                 reader.skip();
-                coordinateArgument3 = CoordinateArgument.parse(reader);
+                coordinateArgument3 = WorldCoordinate.parseInt(reader);
             } else {
                 reader.setCursor(i);
-                throw Vec3ArgumentType.INCOMPLETE_EXCEPTION.createWithContext(reader);
+                throw Vec3Argument.ERROR_NOT_COMPLETE.createWithContext(reader);
             }
         } else {
             reader.setCursor(i);
-            throw Vec3ArgumentType.INCOMPLETE_EXCEPTION.createWithContext(reader);
+            throw Vec3Argument.ERROR_NOT_COMPLETE.createWithContext(reader);
         }
 
-        x = coordinateArgument.toAbsoluteCoordinate(mc.player.getX());
-        y = coordinateArgument2.toAbsoluteCoordinate(mc.player.getY());
-        z = coordinateArgument3.toAbsoluteCoordinate(mc.player.getZ());
+        x = coordinateArgument.get(mc.player.getX());
+        y = coordinateArgument2.get(mc.player.getY());
+        z = coordinateArgument3.get(mc.player.getZ());
 
-        return new Vec3d(x,y,z);
+        return new Vec3(x,y,z);
     }
 
 }

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

@@ -7,16 +7,15 @@
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import net.minecraft.command.CommandSource;
-import net.minecraft.text.Text;
-
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
 
 public class EnumArgumentType<T extends Enum<?>> implements ArgumentType<T> {
     private static final DynamicCommandExceptionType NO_SUCH_TYPE = new DynamicCommandExceptionType(o ->
-            Text.literal(o + " is not a valid argument."));
+            Component.literal(o + " is not a valid argument."));
 
     private T[] values;
 
@@ -52,6 +51,6 @@ public T parse(StringReader reader) throws CommandSyntaxException {
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return CommandSource.suggestMatching(Arrays.stream(values).map(T::toString), builder);
+        return SharedSuggestionProvider.suggest(Arrays.stream(values).map(T::toString), builder);
     }
 }

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

@@ -7,17 +7,16 @@
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import net.minecraft.command.CommandSource;
-import net.minecraft.text.Text;
-
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
 
 public class EnumStringArgumentType implements ArgumentType<String> {
 
     private  Collection<String> EXAMPLES;
     private static final DynamicCommandExceptionType INVALID_OPTION = new DynamicCommandExceptionType(name ->
-            Text.literal(name + " is not a valid option."));
+            Component.literal(name + " is not a valid option."));
     public EnumStringArgumentType(Collection<String> examples) {
         this.EXAMPLES = examples;
     }
@@ -45,7 +44,7 @@ public String toString() {
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return CommandSource.suggestMatching(EXAMPLES, builder);
+        return SharedSuggestionProvider.suggest(EXAMPLES, builder);
     }
 
 }

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

@@ -2,31 +2,31 @@
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import meteordevelopment.meteorclient.commands.Command;
-import net.minecraft.command.CommandSource;
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
-import net.minecraft.util.math.MathHelper;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
+import net.minecraft.util.Mth;
 
 public class CenterCommand extends Command {
     public CenterCommand() {
         super("center", "Centers the player on a block.");
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder.then(literal("middle").executes(context -> {
-            double x = MathHelper.floor(mc.player.getX()) + 0.5;
-            double z = MathHelper.floor(mc.player.getZ()) + 0.5;
-            mc.player.setPosition(x, mc.player.getY(), z);
-            mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX(), mc.player.getY(), mc.player.getZ(), mc.player.isOnGround(), mc.player.horizontalCollision));
+            double x = Mth.floor(mc.player.getX()) + 0.5;
+            double z = Mth.floor(mc.player.getZ()) + 0.5;
+            mc.player.setPos(x, mc.player.getY(), z);
+            mc.player.connection.send(new ServerboundMovePlayerPacket.Pos(mc.player.getX(), mc.player.getY(), mc.player.getZ(), mc.player.onGround(), mc.player.horizontalCollision));
 
             return SINGLE_SUCCESS;
         }));
 
         builder.then(literal("center").executes(context -> {
-            double x = MathHelper.floor(mc.player.getX());
-            double z = MathHelper.floor(mc.player.getZ());
-            mc.player.setPosition(x, mc.player.getY(), z);
-            mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX(), mc.player.getY(), mc.player.getZ(), mc.player.isOnGround(), mc.player.horizontalCollision));
+            double x = Mth.floor(mc.player.getX());
+            double z = Mth.floor(mc.player.getZ());
+            mc.player.setPos(x, mc.player.getY(), z);
+            mc.player.connection.send(new ServerboundMovePlayerPacket.Pos(mc.player.getX(), mc.player.getY(), mc.player.getZ(), mc.player.onGround(), mc.player.horizontalCollision));
 
             return SINGLE_SUCCESS;
         }));

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

@@ -2,17 +2,17 @@
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import meteordevelopment.meteorclient.commands.Command;
-import net.minecraft.command.CommandSource;
+import net.minecraft.commands.SharedSuggestionProvider;
 
 public class ClearChatCommand extends Command {
     public ClearChatCommand() {
         super("clear-chat", "Clears your chat.", "clear", "cls");
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder.executes(context -> {
-            mc.inGameHud.getChatHud().clear(false);
+            mc.gui.getChat().clearMessages(false);
             return SINGLE_SUCCESS;
         });
     }