port to 1.21.11

8 files changed, 33 insertions, 30 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index cbeb720..224c9c2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
     java
-    id("fabric-loom") version "1.9-SNAPSHOT"
+    id("net.fabricmc.fabric-loom-remap") version "1.15-SNAPSHOT"
 }
 
-val minecraftVersion = "1.21.4"
+val minecraftVersion = "1.21.11"
 version = "1.0.3+$minecraftVersion"
 group = "net.inyourwalls"
 
@@ -14,13 +14,13 @@ repositories {
 
 dependencies {
     // Fabric/Minecraft dependencies.
-    val yarnBuild = "8"
+    val yarnBuild = "4"
     minecraft("com.mojang:minecraft:$minecraftVersion")
     mappings("net.fabricmc:yarn:$minecraftVersion+build.$yarnBuild:v2")
-    modImplementation("net.fabricmc:fabric-loader:0.14.23")
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.114.2+$minecraftVersion")
+    modImplementation("net.fabricmc:fabric-loader:0.18.4")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.141.3+$minecraftVersion")
 
-    modImplementation("com.terraformersmc:modmenu:9.0.0")
+    modImplementation("com.terraformersmc:modmenu:17.0.0-beta.2")
 }
 
 tasks {
diff --git a/flake.lock b/flake.lock
index 90041fa..f52c5ed 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736344531,
-        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
+        "lastModified": 1771848320,
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5716063..965fe52 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,11 @@
   outputs = { self, nixpkgs }: {
     devShells.x86_64-linux.default = let pkgs = nixpkgs.legacyPackages.x86_64-linux;
     in pkgs.mkShell {
+      buildInputs = with pkgs; [
+        libglvnd
+      ];
+
+      LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ libglvnd ];
       nativeBuildInputs = with pkgs.buildPackages; [
         gradle
         jdk21
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b9..61285a6 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a79..19a6bde 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java b/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java
index 3f74a01..e639a1e 100644
--- a/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java
+++ b/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java
@@ -73,7 +73,7 @@ public class ScreenEventHandler implements ScreenEvents.AfterRender, ScreenEvent
             Text.translatable("ui.frank.time_left", minutesLeft, secondsLeft),
             x,
             y,
-            this.config.getTextColour()
+            0xff000000 | this.config.getTextColour()
         );
     }
 
@@ -83,7 +83,7 @@ public class ScreenEventHandler implements ScreenEvents.AfterRender, ScreenEvent
             Text.translatable("ui.frank.smeltable", itemsSmeltable),
             x,
             y,
-            this.config.getTextColour()
+            0xff000000 | this.config.getTextColour()
         );
     }
 
@@ -93,28 +93,28 @@ public class ScreenEventHandler implements ScreenEvents.AfterRender, ScreenEvent
             Text.literal("remainingFuelTicks: " + screenHandler.getRemainingFuelTicks()),
             x,
             y,
-            0xffffff
+            0xffffffff
         );
         drawContext.drawTextWithShadow(
             this.client.textRenderer,
             Text.literal("totalFuelTicks: " + screenHandler.getTotalFuelTicks()),
             x,
             y + 10,
-            0xffffff
+            0xffffffff
         );
         drawContext.drawTextWithShadow(
             this.client.textRenderer,
             Text.literal("currentCookingTicks: " + screenHandler.getCurrentCookingTicks()),
             x,
             y + 20,
-            0xffffff
+            0xffffffff
         );
         drawContext.drawTextWithShadow(
             this.client.textRenderer,
             Text.literal("totalCookingTicks: " + screenHandler.getTotalCookingTicks()),
             x,
             y + 30,
-            0xffffff
+            0xffffffff
         );
     }
 
diff --git a/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java b/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java
index 8cabcc0..46277c7 100644
--- a/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java
+++ b/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java
@@ -3,12 +3,12 @@ package net.inyourwalls.frank.config;
 
 import net.inyourwalls.frank.Frank;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
@@ -114,14 +114,14 @@ public class ConfigScreen extends Screen {
             DISPLAY_MODE_LABEL,
             labelX,
             30,
-            0xffffff
+            0xffffffff
         );
         context.drawTextWithShadow(
             this.textRenderer,
             TEXT_COLOUR_LABEL,
             labelX,
             60,
-            0xffffff
+            0xffffffff
         );
 
         renderPreview(context, this.width / 2 - FURNACE_TEXTURE_WIDTH / 2, this.height / 2 - FURNACE_TEXTURE_HEIGHT / 2);
@@ -129,7 +129,7 @@ public class ConfigScreen extends Screen {
 
     private void renderPreview(DrawContext context, int x, int y) {
         context.drawTexture(
-            RenderLayer::getGuiTextured,
+            RenderPipelines.GUI_TEXTURED,
             FURNACE_UI_TEXTURE,
             x,
             y,
@@ -146,7 +146,7 @@ public class ConfigScreen extends Screen {
             Text.translatable("ui.frank.config.preview"),
             x + (FURNACE_TEXTURE_WIDTH / 2),
             y + 6,
-            0x404040
+            0xff404040
         );
 
         int infoX = x + FURNACE_TEXTURE_WIDTH + 2;
@@ -158,14 +158,14 @@ public class ConfigScreen extends Screen {
                     Text.translatable("ui.frank.time_left", 0, 0),
                     infoX,
                     infoY,
-                    modifiedConfig.getTextColour()
+                    0xff000000 | modifiedConfig.getTextColour()
                 );
                 context.drawTextWithShadow(
                     this.textRenderer,
                     Text.translatable("ui.frank.smeltable", 0),
                     infoX,
                     infoY + 10,
-                    modifiedConfig.getTextColour()
+                    0xff000000 | modifiedConfig.getTextColour()
                 );
                 break;
             }
@@ -176,7 +176,7 @@ public class ConfigScreen extends Screen {
                     Text.translatable("ui.frank.time_left", 0, 0),
                     infoX,
                     infoY,
-                    modifiedConfig.getTextColour()
+                    0xff000000 | modifiedConfig.getTextColour()
                 );
                 break;
             }
@@ -187,14 +187,14 @@ public class ConfigScreen extends Screen {
                     Text.translatable("ui.frank.smeltable", 0),
                     infoX,
                     infoY,
-                    modifiedConfig.getTextColour()
+                    0xff000000 | modifiedConfig.getTextColour()
                 );
                 context.drawTextWithShadow(
                     this.textRenderer,
                     Text.translatable("ui.frank.time_left", 0, 0),
                     infoX,
                     infoY + 10,
-                    modifiedConfig.getTextColour()
+                    0xff000000 | modifiedConfig.getTextColour()
                 );
                 break;
             }
@@ -205,7 +205,7 @@ public class ConfigScreen extends Screen {
                     Text.translatable("ui.frank.smeltable", 0),
                     infoX,
                     infoY,
-                    modifiedConfig.getTextColour()
+                    0xff000000 | modifiedConfig.getTextColour()
                 );
                 break;
             }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 424a293..7e1eef4 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -17,9 +17,7 @@
     "client": [
       "net.inyourwalls.frank.Frank"
     ],
-    "modmenu": [
-      "net.inyourwalls.frank.ModMenuIntegration"
-    ]
+    "modmenu": ["net.inyourwalls.frank.ModMenuIntegration"]
   },
   "mixins": [
     "frank.mixins.json"