From 59a17d854018f83cf4230b3f914bef5e2b16b477 Mon Sep 17 00:00:00 2001
From: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
Date: Tue, 18 Mar 2025 21:37:16 +0100
Subject: [PATCH] port to 1.21(.1)

---
 .minepkg-lock.toml                                  | 10 +++++-----
 gradle.properties                                   | 10 +++++-----
 minepkg.toml                                        |  2 +-
 src/main/java/io/minepkg/testutils/RuleBookGUI.java |  8 ++++----
 src/main/java/io/minepkg/testutils/TestUtils.java   |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.minepkg-lock.toml b/.minepkg-lock.toml
index d2bfffc..f70df62 100644
--- a/.minepkg-lock.toml
+++ b/.minepkg-lock.toml
@@ -4,20 +4,20 @@
 lockfileVersion = 1
 
 [fabric]
-  minecraft = "1.20.6"
+  minecraft = "1.21.1"
   fabricLoader = "0.16.10"
-  mapping = "1.20.6+build.3"
+  mapping = "1.21.1+build.3"
 
 [dependencies]
 
   [dependencies.fabric]
     name = "fabric"
-    version = "0.100.8+1.20.6.mpkg.1"
+    version = "0.115.2+1.21.1.mpkg.1"
     versionName = ""
     type = "mod"
     ipfsHash = ""
-    Sha256 = "aa0457cd765d62072c8ceeb75f4d8ea36698ae996e71c28a898da4d0a81752b2"
-    url = "https://api.preview.minepkg.io/v1/releases/fabric/fabric@0.100.8+1.20.6.mpkg.1/download"
+    Sha256 = "92401650136b38eada3e74a451640ffe50971d5c6f532742924a931c271e6a67"
+    url = "https://api.preview.minepkg.io/v1/releases/fabric/fabric@0.115.2+1.21.1.mpkg.1/download"
     provider = "minepkg"
     dependent = ""
 
diff --git a/gradle.properties b/gradle.properties
index fe70cfb..af4c3ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.20.6
-yarn_mappings=1.20.6+build.3
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
 loader_version=0.16.10
 
 # Mod Properties
@@ -13,8 +13,8 @@ maven_group=io.minepkg
 archives_base_name=test-utils
 
 # Dependencies
-fabric_version=0.100.8+1.20.6
-libgui_version=10.0.0+1.20.6
+fabric_version=0.102.0+1.21
+libgui_version=11.1.0+1.21
 
-minecraft_version_range= 1.20.6
+minecraft_version_range= >=1.21 <=1.21.1
 java_version=21
diff --git a/minepkg.toml b/minepkg.toml
index daa627e..c8dfadc 100755
--- a/minepkg.toml
+++ b/minepkg.toml
@@ -13,7 +13,7 @@ manifestVersion = 0
 
 # These are global requirements
 [requirements]
-  minecraft = "1.20.6"
+  minecraft = ">=1.21.0 <=1.21.1"
   fabricLoader = "*"
 
 [dependencies]
diff --git a/src/main/java/io/minepkg/testutils/RuleBookGUI.java b/src/main/java/io/minepkg/testutils/RuleBookGUI.java
index 64590ab..4ecd9d1 100644
--- a/src/main/java/io/minepkg/testutils/RuleBookGUI.java
+++ b/src/main/java/io/minepkg/testutils/RuleBookGUI.java
@@ -26,16 +26,16 @@
 import net.minecraft.world.biome.Biome;
 
 class WEnvMonitor extends WUsableClippedPanel {
-  private static final Identifier SNOW_GRASS = new Identifier("minecraft:textures/block/grass_block_snow.png");
-  private static final Identifier NORMAL_GRASS = new Identifier("minecraft:textures/block/grass_block_side.png");
+  private static final Identifier SNOW_GRASS = Identifier.ofVanilla("textures/block/grass_block_snow.png");
+  private static final Identifier NORMAL_GRASS = Identifier.ofVanilla("textures/block/grass_block_side.png");
 
   private boolean canSnow = false;
   WSprite sun = new WSprite(TestUtils.id("sun_env.png"));
   WSprite mun = new WSprite(TestUtils.id("mun_env.png"));
   WGradient bg = new WGradient();
   WTiledSprite grass = new WTiledSprite(12, 12, NORMAL_GRASS);
-  WTiledSprite rain = new WTiledSprite(24, 120, new Identifier("minecraft:textures/environment/rain.png"));
-  WTiledSprite snow = new WTiledSprite(24, 120, new Identifier("minecraft:textures/environment/snow.png"));
+  WTiledSprite rain = new WTiledSprite(24, 120, Identifier.ofVanilla("textures/environment/rain.png"));
+  WTiledSprite snow = new WTiledSprite(24, 120, Identifier.ofVanilla("textures/environment/snow.png"));
 
   RGB topDayColor = new RGB(0xFF_8cb6fc);
   RGB bottomDayColor = new RGB(0xFF_b5d1ff);
diff --git a/src/main/java/io/minepkg/testutils/TestUtils.java b/src/main/java/io/minepkg/testutils/TestUtils.java
index 9faf8d6..f9b6c88 100644
--- a/src/main/java/io/minepkg/testutils/TestUtils.java
+++ b/src/main/java/io/minepkg/testutils/TestUtils.java
@@ -35,7 +35,7 @@ public class TestUtils implements ModInitializer {
   public static final short WEATHER_THUNDER = 3;
 
   public static Identifier id(String path) {
-    return new Identifier(MOD_ID, path);
+    return Identifier.of(MOD_ID, path);
   }
 
   @Override