Update to 26.2

build.gradle.kts

@@ -1,10 +1,9 @@
 plugins {
-    id("fabric-loom") version "1.10-SNAPSHOT"
+    id("net.fabricmc.fabric-loom") version "1.17-SNAPSHOT"
 }
 
 val targetVersion = findProperty("target_version") as String? ?: "1_21_4"
 val minecraftVersion = properties["minecraft_version_$targetVersion"] as String
-val yarnMappings = properties["yarn_mappings_$targetVersion"] as String
 val loaderVersion = properties["loader_version_$targetVersion"] as String
 
 base {
@@ -29,14 +28,13 @@ val meteorClientVersion = if (minecraftVersion == "1.21.1") "0.5.8" else minecra
 dependencies {
     // Fabric
     minecraft("com.mojang:minecraft:$minecraftVersion")
-    mappings("net.fabricmc:yarn:$yarnMappings:v2")
-    modImplementation("net.fabricmc:fabric-loader:$loaderVersion")
+    implementation("net.fabricmc:fabric-loader:$loaderVersion")
 
     // Meteor
-    modImplementation("meteordevelopment:meteor-client:$meteorClientVersion-SNAPSHOT")
+    implementation("meteordevelopment:meteor-client:$meteorClientVersion-SNAPSHOT")
 
     // Baritone
-    modCompileOnly("meteordevelopment:baritone:$minecraftVersion-SNAPSHOT")
+    compileOnly("meteordevelopment:baritone:$minecraftVersion-SNAPSHOT")
 }
 
 tasks {
@@ -66,12 +64,12 @@ tasks {
     }
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
     }
 
     withType<JavaCompile> {
         options.encoding = "UTF-8"
-        options.release = 21
+        options.release = 25
     }
 }

gradle.properties

@@ -12,9 +12,9 @@ yarn_mappings_1_21_1=1.21.1+build.3
 loader_version_1_21_1=0.16.14
 
 # 1.21.4 Fabric Properties
-minecraft_version_1_21_4=1.21.4
-yarn_mappings_1_21_4=1.21.4+build.8
-loader_version_1_21_4=0.16.14
+minecraft_version_1_21_4=26.2
+# yarn_mappings_1_21_4=1.21.4+build.8
+loader_version_1_21_4=0.19.3
 
 # 1.21.5 Fabric Properties
 minecraft_version_1_21_5=1.21.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 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.5.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/xyz/omegaware/addon/commands/LinkCommand.java

@@ -3,7 +3,7 @@
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import meteordevelopment.meteorclient.commands.Command;
-import net.minecraft.command.CommandSource;
+import net.minecraft.client.multiplayer.ClientSuggestionProvider;
 import xyz.omegaware.addon.modules.TSRKitBotModule;
 
 public class LinkCommand extends Command {
@@ -12,7 +12,7 @@ public LinkCommand() {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<ClientSuggestionProvider> builder) {
         builder.then(argument("2FACode", StringArgumentType.word()).executes(context -> {
             TSRKitBotModule.getIsLinked(StringArgumentType.getString(context, "2FACode"));
             return SINGLE_SUCCESS;

src/main/java/xyz/omegaware/addon/commands/ShulkerQueueCommand.java

@@ -2,9 +2,9 @@
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import meteordevelopment.meteorclient.commands.Command;
-import net.minecraft.command.CommandSource;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.multiplayer.ClientSuggestionProvider;
+import net.minecraft.world.item.ItemStack;
 import xyz.omegaware.addon.modules.ItemFrameDupeModule;
 import xyz.omegaware.addon.utils.Logger;
 
@@ -14,21 +14,21 @@ public ShulkerQueueCommand() {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<ClientSuggestionProvider> builder) {
         builder.then(literal("add").executes(context -> {
             if (mc.player == null) {
                 Logger.error("Player was somehow null");
                 return SINGLE_SUCCESS;
             }
 
-            ItemStack stack = mc.player.getMainHandStack();
+            ItemStack stack = mc.player.getMainHandItem();
             if (stack.isEmpty()) {
                 Logger.error("You must hold an item in your main hand");
                 return SINGLE_SUCCESS;
             }
             ItemFrameDupeModule.shulkerQueue.add(stack.copy());
 
-            Logger.info("%sAdded %s to the shulker queue", Formatting.GREEN, stack.toHoverableText());
+            Logger.info("%sAdded %s to the shulker queue", ChatFormatting.GREEN, stack.getDisplayName());
 
             return SINGLE_SUCCESS;
         }));
@@ -39,7 +39,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
                 return SINGLE_SUCCESS;
             }
 
-            ItemStack stack = mc.player.getMainHandStack();
+            ItemStack stack = mc.player.getMainHandItem();
             if (stack.isEmpty()) {
                 Logger.error("You must hold an item in your main hand");
                 return SINGLE_SUCCESS;
@@ -51,7 +51,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
 
             ItemFrameDupeModule.shulkerQueue.remove(stack.copy());
 
-            Logger.info("%sRemoved%s %s from the shulker queue", Formatting.RED, Formatting.WHITE ,stack.toHoverableText());
+            Logger.info("%sRemoved%s %s from the shulker queue", ChatFormatting.RED, ChatFormatting.WHITE ,stack.getDisplayName());
             return SINGLE_SUCCESS;
         }));
 
@@ -65,7 +65,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
                 Logger.info("Shulker queue is empty");
             } else {
                 StringBuilder sb = new StringBuilder("Shulker queue: ");
-                ItemFrameDupeModule.shulkerQueue.forEach(itemStack -> sb.append(itemStack.toHoverableText().getString()).append("\n"));
+                ItemFrameDupeModule.shulkerQueue.forEach(itemStack -> sb.append(itemStack.getDisplayName().getString()).append("\n"));
                 Logger.info(sb.toString());
             }