fix mod tweak xmapWaypointFreecamCompact crash with xaero mods >= 24.6

it's no longer needed since there is no more freecam issue resolved #86
Fallen-Breath · Nov 28, 2024 · 1c193d5 · 1c193d5
1 parent 78c45e4
commit 1c193d5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/docs/document-en_us.md b/docs/document-en_us.md
@@ -2478,13 +2478,13 @@ Make the in-game waypoints render correctly when free camera from tweakeroo is e
 - Mod restrictions:
   - Required mods:
     - Tweakeroo (`tweakeroo`)
-    - Xaero's Minimap (`xaerominimap`)
+    - Xaero's Minimap (`xaerominimap`) `<24.6`
 
   *or*
 
   - Required mods:
     - Tweakeroo (`tweakeroo`)
-    - Better PVP Mod (`xaerobetterpvp`)
+    - Better PVP Mod (`xaerobetterpvp`) `<24.6`
 
 
 ## Porting

diff --git a/docs/document-zh_cn.md b/docs/document-zh_cn.md
@@ -2474,13 +2474,13 @@ Mini HUD的光照等级显示仅于可刷怪方块上渲染
 - 模组约束:
   - 依赖模组:
     - Tweakeroo (`tweakeroo`)
-    - Xaero's Minimap (`xaerominimap`)
+    - Xaero's Minimap (`xaerominimap`) `<24.6`
 
   *或*
 
   - 依赖模组:
     - Tweakeroo (`tweakeroo`)
-    - Better PVP Mod (`xaerobetterpvp`)
+    - Better PVP Mod (`xaerobetterpvp`) `<24.6`
 
 
 ## 移植

diff --git a/src/main/java/me/fallenbreath/tweakermore/config/TweakerMoreConfigs.java b/src/main/java/me/fallenbreath/tweakermore/config/TweakerMoreConfigs.java
@@ -794,8 +794,8 @@ public class TweakerMoreConfigs
 	@Config(
 			type = Config.Type.GENERIC,
 			restriction = {
-					@Restriction(require = {@Condition(ModIds.tweakeroo), @Condition(ModIds.xaero_minimap)}),
-					@Restriction(require = {@Condition(ModIds.tweakeroo), @Condition(ModIds.xaero_betterpvp)}),
+					@Restriction(require = {@Condition(ModIds.tweakeroo), @Condition(value = ModIds.xaero_minimap, versionPredicates = "<24.6")}),
+					@Restriction(require = {@Condition(ModIds.tweakeroo), @Condition(value = ModIds.xaero_betterpvp, versionPredicates = "<24.6")}),
 			},
 			category = Config.Category.MOD_TWEAKS
 	)

diff --git a/...ore/mixins/tweaks/mod_tweaks/xmapWaypointFreecamCompact/WaypointsIngameRendererMixin.java b/...ore/mixins/tweaks/mod_tweaks/xmapWaypointFreecamCompact/WaypointsIngameRendererMixin.java
@@ -35,10 +35,17 @@
 import org.spongepowered.asm.mixin.injection.Group;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
-@Restriction(require = {
-		@Condition(ModIds.tweakeroo),
-		@Condition(type = Condition.Type.TESTER, tester = XaeroCommonMinimapWaypointsIngameRendererTester.class),
-})
+@Restriction(
+		require = {
+				@Condition(ModIds.tweakeroo),
+				@Condition(type = Condition.Type.TESTER, tester = XaeroCommonMinimapWaypointsIngameRendererTester.class),
+		},
+		// No more freecam issue with xaero's mod >= 24.6
+		conflict = {
+				@Condition(value = ModIds.xaero_betterpvp, versionPredicates = ">=24.6"),
+				@Condition(value = ModIds.xaero_minimap, versionPredicates = ">=24.6")
+		}
+)
 @Pseudo
 @Mixin(targets = "xaero.common.minimap.waypoints.render.WaypointsIngameRenderer", remap = false)
 public abstract class WaypointsIngameRendererMixin