Update to 26.1.2

build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
-    id("fabric-loom") version "1.14-SNAPSHOT"
+    id("net.fabricmc.fabric-loom") version "1.17-SNAPSHOT"
     id("maven-publish")
 }
 
 version = "${properties["mod_version"]!!}${extraVersion()}"
 group = properties["maven_group"]!!
-val targetJavaVersion = 21
+val targetJavaVersion = 25
 
 repositories {
     mavenCentral()
@@ -33,26 +33,25 @@ repositories {
 dependencies {
     // Minecraft
     minecraft("com.mojang:minecraft:${properties["minecraft_version"]!!}")
-    mappings(loom.officialMojangMappings())
 
     // Fabric
-    modImplementation("net.fabricmc:fabric-loader:${properties["loader_version"]!!}")
-    modImplementation(libs.fabric.api)
+    implementation("net.fabricmc:fabric-loader:${properties["loader_version"]!!}")
+    implementation(libs.fabric.api)
 
     // Libraries
-    modApi(libs.yacl) {
+    api(libs.yacl) {
         exclude(group = "com.twelvemonkeys.common")
         exclude(group = "com.twelvemonkeys.imageio")
     }
-    modApi(libs.modmenu)
-    modApi(libs.noxesium.fabric)
+    api(libs.modmenu)
+    api(libs.noxesium.fabric)
     include(libs.discord.game.sdk4j)
     implementation(libs.discord.game.sdk4j)
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
 }
 
 tasks.jar {
@@ -72,10 +71,6 @@ tasks.processResources {
 
 loom {
     accessWidenerPath.set(file("src/main/resources/islandutils.accesswidener"))
-
-    mixin {
-        defaultRefmapName.set("islandutils.refmap.json")
-    }
 }
 
 fun extraVersion(): String {

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.11
-loader_version=0.18.3
+minecraft_version=26.1.2
+loader_version=0.19.2
 
 # Mod Properties
 mod_version=1.7.4

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-fabric-api = "0.140.2+1.21.11"
-yacl = "3.8.1+1.21.11-fabric"
-modmenu = "17.0.0-beta.1"
-noxesium = "3.0.0"
+fabric-api = "0.155.2+26.1.2"
+yacl = "3.9.5+26.1-fabric"
+modmenu = "18.0.0"
+noxesium = "3.1.1"
 discord-game-sdk4j = "v1.0.0"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/net/asodev/islandutils/IslandUtilsClient.java

@@ -14,13 +14,15 @@
 import net.asodev.islandutils.util.ChatUtils;
 import net.asodev.islandutils.util.IslandUtilsCommand;
 import net.asodev.islandutils.util.Utils;
+import org.lwjgl.glfw.GLFW;
+
+import net.minecraft.client.KeyMapping;
+import net.minecraft.resources.Identifier;
+
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.resources.Identifier;
-import org.lwjgl.glfw.GLFW;
+import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
 
 @Environment(EnvType.CLIENT)
 public class IslandUtilsClient implements ClientModInitializer {
@@ -30,13 +32,13 @@ public class IslandUtilsClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        openPlobbyKey = KeyBindingHelper.registerKeyBinding(new KeyMapping(
+        openPlobbyKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
                 "key.islandutils.plobbymenu",
                 InputConstants.Type.KEYSYM,
                 GLFW.GLFW_KEY_K,
                 keyCategory
         ));
-        disguiseKeyBind = KeyBindingHelper.registerKeyBinding(new KeyMapping(
+        disguiseKeyBind = KeyMappingHelper.registerKeyMapping(new KeyMapping(
                 "key.islandutils.disguise",
                 InputConstants.Type.KEYSYM,
                 GLFW.GLFW_KEY_N,

src/main/java/net/asodev/islandutils/mixins/BossUIMixin.java

@@ -1,10 +1,13 @@
 package net.asodev.islandutils.mixins;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
 import net.asodev.islandutils.modules.splits.ui.SplitUI;
 import net.asodev.islandutils.state.MccIslandState;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.BossHealthOverlay;
-import net.minecraft.client.gui.components.LerpingBossEvent;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -13,7 +16,9 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.*;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.BossHealthOverlay;
+import net.minecraft.client.gui.components.LerpingBossEvent;
 
 /**
  * We're using a mixin rather than HudRenderCallback because
@@ -30,8 +35,8 @@ public class BossUIMixin {
     @Unique
     private static final List<String> QUEUE_BOSSBAR_PATTERNS = List.of("(((((", "TELEPORTING (", "TELEPORTED!");
 
-    @Inject(method = "render", at = @At("HEAD"))
-    private void render(GuiGraphics guiGraphics, CallbackInfo ci) {
+    @Inject(method = "extractRenderState", at = @At("HEAD"))
+    private void render(GuiGraphicsExtractor guiGraphics, CallbackInfo ci) {
         if (!MccIslandState.isOnline()) return;
 
         List<LerpingBossEvent> list = new ArrayList<>(events.values());

src/main/java/net/asodev/islandutils/mixins/cosmetics/ChestScreenMixin.java

@@ -1,5 +1,9 @@
 package net.asodev.islandutils.mixins.cosmetics;
 
+import static net.asodev.islandutils.util.Utils.getCustomItemID;
+
+import java.util.Objects;
+
 import com.mojang.blaze3d.platform.InputConstants;
 import net.asodev.islandutils.modules.cosmetics.Cosmetic;
 import net.asodev.islandutils.modules.cosmetics.CosmeticSlot;
@@ -8,9 +12,17 @@
 import net.asodev.islandutils.options.IslandOptions;
 import net.asodev.islandutils.state.MccIslandState;
 import net.asodev.islandutils.util.IslandSoundEvents;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.input.KeyEvent;
@@ -23,22 +35,12 @@
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.ClickType;
+import net.minecraft.world.inventory.ContainerInput;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.Objects;
-
-import static net.asodev.islandutils.util.Utils.getCustomItemID;
+import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
 
 
 @Mixin(AbstractContainerScreen.class)
@@ -60,8 +62,8 @@ private void onInit(AbstractContainerMenu abstractContainerMenu, Inventory inven
         CosmeticState.accessorySlot.setOriginal(new CosmeticSlot(player.getInventory().getItem(40)));
     }
 
-    @Inject(method = "renderSlot", at = @At("TAIL"))
-    private void renderSlot(GuiGraphics guiGraphics, Slot slot, int i, int j, CallbackInfo ci) {
+    @Inject(method = "extractSlot", at = @At("TAIL"))
+    private void renderSlot(GuiGraphicsExtractor guiGraphics, Slot slot, int i, int j, CallbackInfo ci) {
         if (!CosmeticState.shouldShowCosmeticPreview()) return;
         if (!slot.hasItem()) return;
 
@@ -76,8 +78,8 @@ private void renderSlot(GuiGraphics guiGraphics, Slot slot, int i, int j, Callba
         }
     }
 
-    @Inject(method = "render", at = @At("TAIL"))
-    private void render(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo ci) {
+    @Inject(method = "extractRenderState", at = @At("TAIL"))
+    private void render(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a, CallbackInfo ci) {
         if (hoveredSlot != null && hoveredSlot.hasItem()) {
             ItemStack hoveredItem = hoveredSlot.getItem();
             if (IslandOptions.getCosmetics().isShowOnHover()) {
@@ -130,7 +132,7 @@ private void mouseReleased(MouseButtonEvent mouseButtonEvent, CallbackInfoReturn
     }
 
     @Inject(method = "slotClicked", at = @At("HEAD"))
-    private void slotClicked(Slot slot, int i, int j, ClickType clickType, CallbackInfo ci) {
+    private void slotClicked(Slot slot, int slotId, int buttonNum, ContainerInput containerInput, CallbackInfo ci) {
         if (!MccIslandState.isOnline()) return;
         if (!MccIslandState.getGame().isHubGame()) return;
 
@@ -150,7 +152,7 @@ private void slotClicked(Slot slot, int i, int j, ClickType clickType, CallbackI
     private void triggerPreviewClicked(int keyCode) {
         if (!CosmeticState.shouldShowCosmeticPreview()) return;
         if (hoveredSlot == null || !hoveredSlot.hasItem()) return;
-        InputConstants.Key previewBind = KeyBindingHelper.getBoundKeyOf(minecraft.options.keyPickItem);
+        InputConstants.Key previewBind = KeyMappingHelper.getBoundKeyOf(minecraft.options.keyPickItem);
         if (keyCode == previewBind.getValue()) {
             ItemStack item = hoveredSlot.getItem();
             if (item.is(Items.GHAST_TEAR) || item.is(Items.AIR)) return;

src/main/java/net/asodev/islandutils/mixins/cosmetics/UIMixin.java

@@ -1,14 +1,21 @@
 package net.asodev.islandutils.mixins.cosmetics;
 
+import static net.asodev.islandutils.modules.cosmetics.CosmeticState.applyColor;
+
 import net.asodev.islandutils.mixins.accessors.WalkAnimStateAccessor;
 import net.asodev.islandutils.modules.cosmetics.CosmeticState;
 import net.asodev.islandutils.modules.cosmetics.CosmeticType;
 import net.asodev.islandutils.modules.cosmetics.CosmeticUI;
 import net.asodev.islandutils.options.IslandOptions;
 import net.asodev.islandutils.options.categories.CosmeticsOptions;
 import net.asodev.islandutils.util.FontUtils;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.ContainerScreen;
 import net.minecraft.network.chat.Component;
@@ -17,21 +24,15 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.ChestMenu;
 import net.minecraft.world.item.ItemStack;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import static net.asodev.islandutils.modules.cosmetics.CosmeticState.applyColor;
 
 @Mixin(ContainerScreen.class)
 public abstract class UIMixin extends AbstractContainerScreen<ChestMenu> {
     public UIMixin(ChestMenu abstractContainerMenu, Inventory inventory, Component component) {
         super(abstractContainerMenu, inventory, component);
     }
 
-    @Inject(method = "render", at = @At("TAIL"))
-    public void render(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo ci) {
+    @Inject(method = "extractBackground", at = @At("TAIL"))
+    public void render(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a, CallbackInfo ci) {
         if (!CosmeticState.shouldShowCosmeticPreview()) return;
 
         CosmeticsOptions options = IslandOptions.getCosmetics();
@@ -92,7 +93,7 @@ public void render(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo
         int y = (this.height / 2) + size;
 
         CosmeticUI.renderPlayerInInventory(
-                guiGraphics,
+            graphics,
                 x - bounds, // x0
                 (this.height / 2) - bounds, // y0
                 x + bounds, // x1
@@ -113,14 +114,14 @@ public void render(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo
 
         y += 8;
         int backgroundColor = 0x60000000;
-        guiGraphics.fill(x-(size / 2) - 2, y, x+(size / 2)+2, y + 19, backgroundColor);
-        guiGraphics.drawString(this.font, FontUtils.TOOLTIP_HAT, x-(size / 2) + 4, y + 6, 16777215 | 255 << 24);
-        guiGraphics.renderItem(this.minecraft.player, hatSlot, itemPos, y+2, x + y * this.imageWidth);
+        graphics.fill(x-(size / 2) - 2, y, x+(size / 2)+2, y + 19, backgroundColor);
+        graphics.text(this.font, FontUtils.TOOLTIP_HAT, x-(size / 2) + 4, y + 6, 16777215 | 255 << 24);
+        graphics.item(this.minecraft.player, hatSlot, itemPos, y+2, x + y * this.imageWidth);
 
         y += 19 + 4;
-        guiGraphics.fill(x-(size / 2) - 2, y, x+(size / 2)+2, y + 19, backgroundColor);
-        guiGraphics.drawString(this.font, FontUtils.TOOLTIP_ACCESSORY, x-(size / 2) + 4, y + 6, 16777215 | 255 << 24);
-        guiGraphics.renderItem(this.minecraft.player, accSlot, itemPos, y+2, x + y * this.imageWidth);
+        graphics.fill(x-(size / 2) - 2, y, x+(size / 2)+2, y + 19, backgroundColor);
+        graphics.text(this.font, FontUtils.TOOLTIP_ACCESSORY, x-(size / 2) + 4, y + 6, 16777215 | 255 << 24);
+        graphics.item(this.minecraft.player, accSlot, itemPos, y+2, x + y * this.imageWidth);
     }
 
     private void checkInspect() {

src/main/java/net/asodev/islandutils/mixins/crafting/RemnantHighlightMixin.java

@@ -1,25 +1,26 @@
 package net.asodev.islandutils.mixins.crafting;
 
+import java.util.List;
+
 import net.asodev.islandutils.state.MccIslandState;
 import net.asodev.islandutils.util.Utils;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.network.chat.Component;
-import net.minecraft.util.ARGB;
-import net.minecraft.world.inventory.Slot;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.List;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.renderer.RenderPipelines;
+import net.minecraft.network.chat.Component;
+import net.minecraft.util.ARGB;
+import net.minecraft.world.inventory.Slot;
 
 @Mixin(AbstractContainerScreen.class)
 public class RemnantHighlightMixin {
 
-    @Inject(method = "renderSlot", at = @At("HEAD"))
-    private void renderSlot(GuiGraphics guiGraphics, Slot slot, int i, int j, CallbackInfo ci) {
+    @Inject(method = "extractSlot", at = @At("HEAD"))
+    private void renderSlot(GuiGraphicsExtractor guiGraphics, Slot slot, int i, int j, CallbackInfo ci) {
         if (!MccIslandState.isOnline()) return;
         if (!slot.hasItem()) return;