1.21

constellation-mc · Jul 28, 2024 · 24f9a5e · 24f9a5e
1 parent 7367305
commit 24f9a5e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,10 @@ dependencies {
     }
 
     modImplementation libs.dark.matter.item.group
-    modCompileOnly libs.owo
+    modCompileOnly(libs.owo) {
+        exclude(group: "io.wispforest.endec")
+        exclude(group: "io.wispforest", module: "endec")
+    }
 
     testmodImplementation sourceSets.main.output
     testmodRemapImplementation(libs.handy.tests) {
@@ -127,7 +130,7 @@ processResources {
     }
 }
 
-def targetJavaVersion = 17
+def targetJavaVersion = 21
 tasks.withType(JavaCompile).configureEach {
     // ensure that the encoding is set to UTF-8, no matter what the system default is
     // this fixes some edge cases with special characters not displaying correctly

diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,8 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.6
-yarn_mappings=1.20.6+build.1
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
 # Mod Properties
 mod_version=0.11.2
 maven_group=me.melontini

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-dark-matter = "4.0.1-1.20.5-build.79"
+dark-matter = "4.1.0-1.21-build.89"
 
 [libraries]
 fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version = "0.16.0" }
@@ -11,12 +11,12 @@ dark-matter-enums = { group = "me.melontini", name = "dark-matter-enums", versio
 dark-matter-recipe-book = { group = "me.melontini", name = "dark-matter-recipe-book", version.ref = "dark-matter" }
 dark-matter-item-group = { group = "me.melontini", name = "dark-matter-item-group", version.ref = "dark-matter" }
 
-owo = { group = "io.wispforest", name = "owo-lib", version = "0.12.7+1.20.5" }
+owo = { group = "io.wispforest", name = "owo-lib", version = "0.12.10+1.21" }
 
-handy-tests = { group = "me.melontini", name = "handy-tests", version = "0.1.0-1.20.5-build.7" }
+handy-tests = { group = "me.melontini", name = "handy-tests", version = "0.3.0-1.21-build.19" }
 
 [plugins]
-fabric-loom = { id = "fabric-loom", version = "1.6.12" }
+fabric-loom = { id = "fabric-loom", version = "1.7.2" }
 lombok = { id = "io.freefair.lombok", version = "8.6"}
 spotbugs-base = { id = "com.github.spotbugs-base", version = "6.0.19" }
 spotless = { id = "com.diffplug.spotless", version = "6.25.0" }

diff --git 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/me/melontini/recipebookispain/RecipeBookIsPain.java b/src/main/java/me/melontini/recipebookispain/RecipeBookIsPain.java
@@ -42,7 +42,7 @@ public static RecipeBookGroup toRecipeBookGroup(ItemGroup itemGroup) {
             MinecraftClient client = MinecraftClient.getInstance();
             double e = client.mouse.getX() * client.getWindow().getScaledWidth() / client.getWindow().getWidth();
             double f = client.mouse.getY() * client.getWindow().getScaledHeight() / client.getWindow().getHeight();
-            owoItemGroup.icon().render(context, widget.getX() + 9 + i, widget.getY() + 5, (int) e, (int) f, client.getTickDelta());
+            owoItemGroup.icon().render(context, widget.getX() + 9 + i, widget.getY() + 5, (int) e, (int) f, client.getRenderTickCounter().getTickDelta(true));
             return true;
         }
         return false;

diff --git a/src/main/java/me/melontini/recipebookispain/mixin/groups/ClientRecipeBookMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/groups/ClientRecipeBookMixin.java
@@ -43,7 +43,7 @@ public class ClientRecipeBookMixin {
         ItemGroups.getGroups().stream().filter(itemGroup -> itemGroup.getType() != ItemGroup.Type.HOTBAR && itemGroup.getType() != ItemGroup.Type.INVENTORY && itemGroup.getType() != ItemGroup.Type.SEARCH)
                 .forEach(itemGroup -> {
                     try {
-                        RecipeBookGroup recipeBookGroup = RecipeBookHelper.createGroup(new Identifier("rbip", "crafting_" + ItemGroups.getGroups().indexOf(itemGroup)), itemGroup.getIcon());
+                        RecipeBookGroup recipeBookGroup = RecipeBookHelper.createGroup(Identifier.of("rbip", "crafting_" + ItemGroups.getGroups().indexOf(itemGroup)), itemGroup.getIcon());
                         RECIPE_BOOK_GROUP_TO_ITEM_GROUP.put(recipeBookGroup, itemGroup);
 
                         CRAFTING_LIST.add(recipeBookGroup);