From 62930f9c7a0de3e3e3c4113d5b773414cc4101c9 Mon Sep 17 00:00:00 2001 From: PieKing1215 Date: Sat, 13 Jan 2024 00:41:13 -0500 Subject: [PATCH] Update for 1.20.2+ --- .../java/me/pieking1215/invmove/InvMove.java | 1 + .../invmove/mixin/client/BackgroundMixin.java | 3 +-- .../fabric/src/main/resources/fabric.mod.json | 4 ++-- .../src/main/resources/META-INF/mods.toml | 6 +++--- mc1.20/gradle.properties | 18 +++++++++--------- mc1.20/quilt/src/main/resources/quilt.mod.json | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/crossversion/common/src/main/java/me/pieking1215/invmove/InvMove.java b/crossversion/common/src/main/java/me/pieking1215/invmove/InvMove.java index 86867be..12f6a26 100644 --- a/crossversion/common/src/main/java/me/pieking1215/invmove/InvMove.java +++ b/crossversion/common/src/main/java/me/pieking1215/invmove/InvMove.java @@ -56,6 +56,7 @@ public static void setInstance(InvMove newInstance) { */ @SuppressWarnings("unused") public static void registerModule(Module module) { + System.out.println("[InvMove] Registered Module: " + module); (instance != null ? instance.modules : addonModules).add(module); } diff --git a/crossversion/common/src/main/java/me/pieking1215/invmove/mixin/client/BackgroundMixin.java b/crossversion/common/src/main/java/me/pieking1215/invmove/mixin/client/BackgroundMixin.java index 5c0bf5b..d1d8d72 100644 --- a/crossversion/common/src/main/java/me/pieking1215/invmove/mixin/client/BackgroundMixin.java +++ b/crossversion/common/src/main/java/me/pieking1215/invmove/mixin/client/BackgroundMixin.java @@ -14,8 +14,7 @@ public class BackgroundMixin { @Group @Inject( method = { - "renderBackground(Lcom/mojang/blaze3d/vertex/PoseStack;)V", - "renderBackground(Lnet/minecraft/client/gui/GuiGraphics;)V" + "renderBackground*" }, at = @At(value = "HEAD"), cancellable = true diff --git a/mc1.20/fabric/src/main/resources/fabric.mod.json b/mc1.20/fabric/src/main/resources/fabric.mod.json index 5c286e0..8729772 100644 --- a/mc1.20/fabric/src/main/resources/fabric.mod.json +++ b/mc1.20/fabric/src/main/resources/fabric.mod.json @@ -32,9 +32,9 @@ ], "depends": { - "minecraft": ">=1.20", + "minecraft": ">=1.20.2", "fabric": "*", - "cloth-config": ">=11" + "cloth-config": ">=12" }, "breaks": { "invmove_compat": "<=0.1.0" diff --git a/mc1.20/forge/src/main/resources/META-INF/mods.toml b/mc1.20/forge/src/main/resources/META-INF/mods.toml index 46e7344..cb09e5f 100644 --- a/mc1.20/forge/src/main/resources/META-INF/mods.toml +++ b/mc1.20/forge/src/main/resources/META-INF/mods.toml @@ -15,20 +15,20 @@ description = '''${description}''' [[dependencies.invmove]] modId = "forge" mandatory = true -versionRange = "[46,)" +versionRange = "[48,)" ordering = "NONE" side = "BOTH" [[dependencies.invmove]] modId = "minecraft" mandatory = true -versionRange = "[1.20,)" +versionRange = "[1.20.2,)" ordering = "NONE" side = "BOTH" [[dependencies.invmove]] modId = "cloth_config" mandatory = true -versionRange = "[11,)" +versionRange = "[12,)" ordering = "NONE" side = "CLIENT" \ No newline at end of file diff --git a/mc1.20/gradle.properties b/mc1.20/gradle.properties index ccc57ee..73f6a08 100644 --- a/mc1.20/gradle.properties +++ b/mc1.20/gradle.properties @@ -1,17 +1,17 @@ -minecraft_version=1.20 +minecraft_version=1.20.4 enabled_platforms=quilt,fabric,forge maven_group=me.pieking1215.invmove.20 -architectury_version=9.0.7 -cloth_version=11.0.99 -modmenu_version=7.0.1 +architectury_version=10.0.17 +cloth_version=12.0.119 +modmenu_version=8.0.1 -fabric_loader_version=0.14.21 -fabric_api_version=0.83.0+1.20 +fabric_loader_version=0.15.3 +fabric_api_version=0.91.3+1.20.2 -forge_version=1.20-46.0.12 +forge_version=1.20.4-49.0.19 -quilt_loader_version=0.19.0-beta.18 -quilt_fabric_api_version=7.0.1+0.83.0-1.20 \ No newline at end of file +quilt_loader_version=0.23.0 +quilt_fabric_api_version=7.4.0+0.90.0-1.20.1 \ No newline at end of file diff --git a/mc1.20/quilt/src/main/resources/quilt.mod.json b/mc1.20/quilt/src/main/resources/quilt.mod.json index ae853fe..c9dd79d 100644 --- a/mc1.20/quilt/src/main/resources/quilt.mod.json +++ b/mc1.20/quilt/src/main/resources/quilt.mod.json @@ -42,11 +42,11 @@ }, { "id": "minecraft", - "version": ">=1.20" + "version": ">=1.20.2" }, { "id": "cloth-config", - "version": ">=11" + "version": ">=12" } ], "breaks": [