Compat latest xaeromap (#7)

Nyan-Work · Nov 29, 2023 · de2b3ab · de2b3ab
1 parent 85478ec
commit de2b3ab
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 24 deletions.
diff --git a/src/main/java/com/plusls/xma/XaeroMapAddition.java b/src/main/java/com/plusls/xma/XaeroMapAddition.java
@@ -12,17 +12,17 @@ public class XaeroMapAddition implements ClientModInitializer {
 
     @Dependencies(and = {
             //#if MC > 11904
-            @Dependency(value = "xaerominimap", versionPredicate = ">=23.4.4", optional = true),
+            @Dependency(value = "xaerominimap", versionPredicate = ">=23.9.0", optional = true),
             @Dependency(value = "xaerobetterpvp", versionPredicate = ">=23.4.0", optional = true),
-            @Dependency(value = "xaeroworldmap", versionPredicate = ">=1.30.4", optional = true)
+            @Dependency(value = "xaeroworldmap", versionPredicate = ">=1.37.0", optional = true)
             //#elseif MC > 11902
-            //$$ @Dependency(value = "xaerominimap", versionPredicate = ">=23.1.0", optional = true),
+            //$$ @Dependency(value = "xaerominimap", versionPredicate = ">=23.9.0", optional = true),
             //$$ @Dependency(value = "xaerobetterpvp", versionPredicate = ">=22.16.4", optional = true),
-            //$$ @Dependency(value = "xaeroworldmap", versionPredicate = ">=1.28.9", optional = true)
+            //$$ @Dependency(value = "xaeroworldmap", versionPredicate = ">=1.37.0", optional = true)
             //#elseif MC > 11502
-            //$$ @Dependency(value = "xaerominimap", versionPredicate = ">=23.1.0", optional = true),
+            //$$ @Dependency(value = "xaerominimap", versionPredicate = ">=23.9.0", optional = true),
             //$$ @Dependency(value = "xaerobetterpvp", versionPredicate = ">=22.16.3", optional = true),
-            //$$ @Dependency(value = "xaeroworldmap", versionPredicate = ">=1.28.9", optional = true)
+            //$$ @Dependency(value = "xaeroworldmap", versionPredicate = ">=1.37.0", optional = true)
             //#elseif MC > 11404
             //$$ @Dependency(value = "xaerominimap", versionPredicate = ">=21.10.0.4", optional = true),
             //$$ @Dependency(value = "xaerobetterpvp", versionPredicate = ">=21.10.0.4", optional = true),

diff --git a/src/main/java/com/plusls/xma/mixin/MixinMinimapElementOverMapRendererHandler.java b/src/main/java/com/plusls/xma/mixin/MixinMinimapElementOverMapRendererHandler.java
@@ -37,7 +37,6 @@
 //$$ @Mixin(Minecraft.class)
 //#endif
 public class MixinMinimapElementOverMapRendererHandler {
-
     //#if MC > 11502
     @Inject(method = "render", at = @At(value = "RETURN"))
     private void postRender(
@@ -47,7 +46,7 @@ private void postRender(
             //$$ PoseStack matrixStack,
             //#endif
             Entity renderEntity, Player player, double renderX, double renderY,
-            double renderZ, double ps, double pc, double zoom, boolean cave, float partialTicks,
+            double renderZ, double playerDimDiv, double ps, double pc, double zoom, boolean cave, float partialTicks,
             RenderTarget framebuffer, AXaeroMinimap modMain, MinimapRendererHelper helper,
             MultiBufferSource.BufferSource renderTypeBuffers, Font font,
             MultiTextureRenderTypeRendererProvider multiTextureRenderTypeRenderers, int specW, int specH,

diff --git a/versions/1.16.5/gradle.properties b/versions/1.16.5/gradle.properties
@@ -2,5 +2,5 @@
 minecraft_version=1.16.5
 minecraft_dependency=1.16.x
 # Compatible Libraries
-xaero_world_map_version=1.34.1_Fabric_1.16.5
-xaero_minimap_version=23.8.2_Fabric_1.16.5
+xaero_world_map_version=1.37.0_Fabric_1.16.5
+xaero_minimap_version=23.9.0_Fabric_1.16.5
diff --git a/versions/1.17.1/gradle.properties b/versions/1.17.1/gradle.properties
@@ -2,5 +2,5 @@
 minecraft_version=1.17.1
 minecraft_dependency=1.17.x
 # Compatible Libraries
-xaero_world_map_version=1.34.1_Fabric_1.17.1
-xaero_minimap_version=23.8.2_Fabric_1.17.1
+xaero_world_map_version=1.37.0_Fabric_1.17.1
+xaero_minimap_version=23.9.0_Fabric_1.17.1
diff --git a/versions/1.18.2/gradle.properties b/versions/1.18.2/gradle.properties
@@ -2,5 +2,5 @@
 minecraft_version=1.18.2
 minecraft_dependency=1.18.x
 # Compatible Libraries
-xaero_world_map_version=1.34.1_Fabric_1.18.2
-xaero_minimap_version=23.8.2_Fabric_1.18.2
+xaero_world_map_version=1.37.0_Fabric_1.18.2
+xaero_minimap_version=23.9.0_Fabric_1.18.2
diff --git a/versions/1.19.2/gradle.properties b/versions/1.19.2/gradle.properties
@@ -2,5 +2,5 @@
 minecraft_version=1.19.2
 minecraft_dependency=1.19.2
 # Compatible Libraries
-xaero_world_map_version=1.34.1_Fabric_1.19.1
-xaero_minimap_version=23.8.2_Fabric_1.19.1
+xaero_world_map_version=1.37.0_Fabric_1.19.1
+xaero_minimap_version=23.9.0_Fabric_1.19.1
diff --git a/versions/1.19.3/gradle.properties b/versions/1.19.3/gradle.properties
@@ -2,5 +2,5 @@
 minecraft_version=1.19.3
 minecraft_dependency=1.19.3
 # Compatible Libraries
-xaero_world_map_version=1.34.1_Fabric_1.19.3
-xaero_minimap_version=23.8.2_Fabric_1.19.3
+xaero_world_map_version=1.37.0_Fabric_1.19.3
+xaero_minimap_version=23.9.0_Fabric_1.19.3
diff --git a/versions/1.19.4/gradle.properties b/versions/1.19.4/gradle.properties
@@ -2,5 +2,5 @@
 minecraft_version=1.19.4
 minecraft_dependency=1.19.4
 # Compatible Libraries
-xaero_world_map_version=1.34.1_Fabric_1.19.4
-xaero_minimap_version=23.8.2_Fabric_1.19.4
+xaero_world_map_version=1.37.0_Fabric_1.19.4
+xaero_minimap_version=23.9.0_Fabric_1.19.4
diff --git a/versions/1.20.1/gradle.properties b/versions/1.20.1/gradle.properties
@@ -2,5 +2,5 @@
 minecraft_version=1.20.1
 minecraft_dependency=1.20.1
 # Compatible Libraries
-xaero_world_map_version=1.34.1_Fabric_1.20
-xaero_minimap_version=23.8.2_Fabric_1.20
+xaero_world_map_version=1.37.0_Fabric_1.20
+xaero_minimap_version=23.9.0_Fabric_1.20
diff --git a/versions/1.20.2/gradle.properties b/versions/1.20.2/gradle.properties
@@ -2,5 +2,5 @@
 minecraft_version=1.20.2
 minecraft_dependency=1.20.2
 # Compatible Libraries
-xaero_world_map_version=1.34.1_Fabric_1.20.2
-xaero_minimap_version=23.8.2_Fabric_1.20.2
+xaero_world_map_version=1.37.0_Fabric_1.20.2
+xaero_minimap_version=23.9.0_Fabric_1.20.2