From 258ca7b8784b4e8ce2c003179a926434872dab61 Mon Sep 17 00:00:00 2001 From: Hendrix-Shen Date: Thu, 24 Jul 2025 15:48:58 +0800 Subject: [PATCH 1/3] Add mc1.21.8 support Signed-off-by: Hendrix-Shen --- build.gradle | 4 ++-- gradle.properties | 4 ++-- settings.json | 2 +- .../gradle.properties | 14 +++++++------- ...1.21.7.txt => mapping-fabric-1.21.5-1.21.8.txt} | 0 5 files changed, 12 insertions(+), 12 deletions(-) rename versions/{1.21.7-fabric => 1.21.8-fabric}/gradle.properties (65%) rename versions/{mapping-fabric-1.21.5-1.21.7.txt => mapping-fabric-1.21.5-1.21.8.txt} (100%) diff --git a/build.gradle b/build.gradle index 077f3de1..dad9ee63 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ preprocess { Node mc12103_fabric = createNode("1.21.3-fabric", 1_21_03, "mojang") Node mc12104_fabric = createNode("1.21.4-fabric", 1_21_04, "mojang") Node mc12105_fabric = createNode("1.21.5-fabric", 1_21_05, "mojang") - Node mc12107_fabric = createNode("1.21.7-fabric", 1_21_07, "mojang") + Node mc12108_fabric = createNode("1.21.8-fabric", 1_21_08, "mojang") mc11502_fabric.link(mc11404_fabric, file("versions/mapping-fabric-1.15.2-1.14.4.txt")) mc11605_fabric.link(mc11502_fabric, file("versions/mapping-fabric-1.16.5-1.15.2.txt")) @@ -44,7 +44,7 @@ preprocess { mc12101_fabric.link(mc12103_fabric, file("versions/mapping-fabric-1.21.1-1.21.3.txt")) mc12103_fabric.link(mc12104_fabric, file("versions/mapping-fabric-1.21.3-1.21.4.txt")) mc12104_fabric.link(mc12105_fabric, file("versions/mapping-fabric-1.21.4-1.21.5.txt")) - mc12105_fabric.link(mc12107_fabric, file("versions/mapping-fabric-1.21.5-1.21.7.txt")) + mc12105_fabric.link(mc12108_fabric, file("versions/mapping-fabric-1.21.5-1.21.8.txt")) // NeoForge Node mc12101_neoforge = createNode("1.21.1-neoforge", 1_21_01, "mojang") diff --git a/gradle.properties b/gradle.properties index 1c28dda3..e0d9cb6e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ mod.version=4.0 ## Annotation processor dependencies.lombok_version=1.18.38 ## MagicLib -dependencies.magiclib_dependency=0.8.721 -dependencies.magiclib_version=0.8.721-beta +dependencies.magiclib_dependency=0.8.722 +dependencies.magiclib_version=0.8.722-beta dependencies.pinin_version=1.6.0 # Gradle Plugins diff --git a/settings.json b/settings.json index 6b02e5b4..9b3184cd 100644 --- a/settings.json +++ b/settings.json @@ -16,7 +16,7 @@ "1.21.3-fabric", "1.21.4-fabric", "1.21.5-fabric", - "1.21.7-fabric", + "1.21.8-fabric", "1.21.1-neoforge" ] diff --git a/versions/1.21.7-fabric/gradle.properties b/versions/1.21.8-fabric/gradle.properties similarity index 65% rename from versions/1.21.7-fabric/gradle.properties rename to versions/1.21.8-fabric/gradle.properties index 09754c2c..6b674138 100644 --- a/versions/1.21.7-fabric/gradle.properties +++ b/versions/1.21.8-fabric/gradle.properties @@ -1,15 +1,15 @@ # Dependency Versions -dependencies.minecraft_dependency=>=1.21.6- <1.21.8- -dependencies.minecraft_version=1.21.7 +dependencies.minecraft_dependency=>=1.21.6- <1.21.9- +dependencies.minecraft_version=1.21.8 # Compatible Libraries -dependencies.api.itemscroller_version=0.28.1 -dependencies.api.litematica_version=0.23.1 -dependencies.api.minihud_version=0.36.1 -dependencies.api.tweakeroo_version=0.25.1 +dependencies.api.itemscroller_version=0.28.3 +dependencies.api.litematica_version=0.23.3 +dependencies.api.minihud_version=0.36.3 +dependencies.api.tweakeroo_version=0.25.3 # Publish properties -publish.game_version=1.21.5 +publish.game_version=1.21.6,1.21.7,1.21.8 publish.dependencies_list=\ fabric-api(required){modrinth:P7dR8mSH}{curseforge:306612}#(ignore:github),\ magiclib(required){modrinth:mv1zH6ln}{curseforge:576459}#(ignore:github),\ diff --git a/versions/mapping-fabric-1.21.5-1.21.7.txt b/versions/mapping-fabric-1.21.5-1.21.8.txt similarity index 100% rename from versions/mapping-fabric-1.21.5-1.21.7.txt rename to versions/mapping-fabric-1.21.5-1.21.8.txt From 714448ebd9ceb51866c49ceadb1c00aeef7a026a Mon Sep 17 00:00:00 2001 From: Hendrix-Shen Date: Thu, 24 Jul 2025 15:49:52 +0800 Subject: [PATCH 2/3] Remove forgified-fabric-api dependency Signed-off-by: Hendrix-Shen --- versions/1.16.5-fabric/build.gradle | 3 +-- versions/1.21.1-neoforge/gradle.properties | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/versions/1.16.5-fabric/build.gradle b/versions/1.16.5-fabric/build.gradle index b7703f8f..98bf09c6 100644 --- a/versions/1.16.5-fabric/build.gradle +++ b/versions/1.16.5-fabric/build.gradle @@ -78,8 +78,7 @@ def apiDependencies = [ [itemscroller_fabric_ga , "itemscroller", fabricLike, false], [litematica_fabric_ga , "litematica" , fabricLike, false], [minihud_fabric_ga , "minihud" , fabricLike, false], - [tweakeroo_fabric_ga , "tweakeroo" , fabricLike, false], - ["org.sinytra.forgified-fabric-api:forgified-fabric-api", "fabric_api" , forgeLike , true] + [tweakeroo_fabric_ga , "tweakeroo" , fabricLike, false] ] // Module, Property prefix, Resolve condition, Transitive dependencies. diff --git a/versions/1.21.1-neoforge/gradle.properties b/versions/1.21.1-neoforge/gradle.properties index ee81c5a1..8dc6291e 100644 --- a/versions/1.21.1-neoforge/gradle.properties +++ b/versions/1.21.1-neoforge/gradle.properties @@ -3,9 +3,6 @@ dependencies.neoforge_version=21.1.64 dependencies.minecraft_dependency=1.21.1 dependencies.minecraft_version=1.21.1 -# Required Libraries -dependencies.api.fabric_api_version=0.104.0+2.0.14+1.21.1 - # Compatible Libraries dependencies.api.itemscroller_version=0.2.2-mc1.21.1 dependencies.api.litematica_version=0.3.1-mc1.21.1 From 753b172c38b8d104d18a9bf6fed800d9cb6e7814 Mon Sep 17 00:00:00 2001 From: Hendrix-Shen Date: Fri, 25 Jul 2025 11:47:35 +0800 Subject: [PATCH 3/3] Fix mixin remap (#181) Signed-off-by: Hendrix-Shen --- .../inventoryPreviewSupportSelect/MixinInventoryOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/plusls/MasaGadget/mixin/mod_tweak/tweakeroo/inventoryPreviewSupportSelect/MixinInventoryOverlay.java b/src/main/java/com/plusls/MasaGadget/mixin/mod_tweak/tweakeroo/inventoryPreviewSupportSelect/MixinInventoryOverlay.java index d53f22d8..0751a070 100644 --- a/src/main/java/com/plusls/MasaGadget/mixin/mod_tweak/tweakeroo/inventoryPreviewSupportSelect/MixinInventoryOverlay.java +++ b/src/main/java/com/plusls/MasaGadget/mixin/mod_tweak/tweakeroo/inventoryPreviewSupportSelect/MixinInventoryOverlay.java @@ -25,9 +25,9 @@ public class MixinInventoryOverlay { //$$ method = "renderStackAt(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/item/ItemStack;FFFLnet/minecraft/client/Minecraft;DD)V", //#elseif MC > 12006 //$$ method = "renderStackAt(Lnet/minecraft/world/item/ItemStack;FFFLnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/GuiGraphics;DD)V", - //$$ remap = true, //#else method = "renderStackAt", + remap = true, //#endif at = @At("RETURN") )