fix serverDataSyncer Mixin for Tweakeroo 1.21+ (#84)

* fix serverDataSyncer Mixin for Tweakeroo * Update dependencies
Fallen-Breath · Nov 29, 2024 · c3ceba7 · c3ceba7
1 parent 1c193d5
commit c3ceba7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/common.gradle b/common.gradle
@@ -199,6 +199,7 @@ processResources {
 				"minecraft_dependency": project.minecraft_dependency,
 				"malilib_dependency": project.malilib_dependency,
 				"minihud_conflict": project.getProperties().getOrDefault("minihud_conflict", "<0.0.0"),
+				"tweakeroo_conflict": project.getProperties().getOrDefault("tweakeroo_conflict", "<0.0.0"),
 		]
 		expand valueMap
 	}

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -33,7 +33,8 @@
   ],
 
   "breaks": {
-    "minihud": "${minihud_conflict}"
+    "minihud": "${minihud_conflict}",
+    "tweakeroo": "${tweakeroo_conflict}"
   },
   "depends": {
     "fabricloader": ">=0.11.4",

diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties
@@ -7,6 +7,7 @@
 	minecraft_dependency = >=1.21 <=1.21.1
 	malilib_dependency = >=0.18.0
 	minihud_conflict = <0.32.51
+	tweakeroo_conflict = <0.21.51
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
@@ -17,11 +18,11 @@
 
 	# https://masa.dy.fi/maven/fi/dy/masa/malilib/
 	# https://jitpack.io/#sakura-ryoko/malilib
-	malilib_version = 1.21-0.21.1
+	malilib_version = 1.21-0.21.2
 
 	# https://legacy.curseforge.com/minecraft/mc-mods/tweakeroo/files
 	# tweakeroo-fabric-1.21.1-0.21.50.jar
-	tweakeroo_file_id = 5647797
+	tweakeroo_file_id = 1.21-0.21.53-sakura.2
 
 	# https://legacy.curseforge.com/minecraft/mc-mods/item-scroller/files
 	# itemscroller-fabric-1.21.1-0.24.50.jar

diff --git a/...aSyncer/tweakeroo/RayTraceUtilsMixin.java → ...aSyncer/tweakeroo/RayTraceUtilsMixin.java b/...aSyncer/tweakeroo/RayTraceUtilsMixin.java → ...aSyncer/tweakeroo/RayTraceUtilsMixin.java
diff --git a/...ataSyncer/tweakeroo/RenderUtilsMixin.java → ...ataSyncer/tweakeroo/RenderUtilsMixin.java b/...ataSyncer/tweakeroo/RenderUtilsMixin.java → ...ataSyncer/tweakeroo/RenderUtilsMixin.java
@@ -24,7 +24,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 
 /**
- * Moved to {@link RayTraceUtilsMixin} for mc 1.21.3+
+ * Moved to {@link RayTraceUtilsMixin} for mc 1.21.1+
  */
 @Mixin(DummyClass.class)
 public abstract class RenderUtilsMixin