From de2b3abea54a126de0b713b2a1bb12a350c8fcb8 Mon Sep 17 00:00:00 2001 From: Hendrix-Shen Date: Wed, 29 Nov 2023 15:03:37 +0800 Subject: [PATCH] Compat latest xaeromap (#7) --- src/main/java/com/plusls/xma/XaeroMapAddition.java | 12 ++++++------ .../MixinMinimapElementOverMapRendererHandler.java | 3 +-- versions/1.16.5/gradle.properties | 4 ++-- versions/1.17.1/gradle.properties | 4 ++-- versions/1.18.2/gradle.properties | 4 ++-- versions/1.19.2/gradle.properties | 4 ++-- versions/1.19.3/gradle.properties | 4 ++-- versions/1.19.4/gradle.properties | 4 ++-- versions/1.20.1/gradle.properties | 4 ++-- versions/1.20.2/gradle.properties | 4 ++-- 10 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/plusls/xma/XaeroMapAddition.java b/src/main/java/com/plusls/xma/XaeroMapAddition.java index b85e44c..b52f7a2 100644 --- 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 index c77c863..fc0fa83 100644 --- 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 index 23e6b12..3ec6274 100644 --- 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 index e8a3633..c7009d6 100644 --- 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 index 69db5c8..3248749 100644 --- 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 index 8f0681a..2b5da99 100644 --- 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 index d7f1f00..d9277e3 100644 --- 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 index c417612..756057b 100644 --- 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 index cf7aa83..ac7e868 100644 --- 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 index f4c5fd4..fe9773d 100644 --- 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