WM1.39.0

.github/workflows/1.12.2.yml

@@ -7,7 +7,7 @@ on:
       - "mainline"
 
 env:
-  WORLDMAP_VERSION: "1.38.8"
+  WORLDMAP_VERSION: "1.39.0"
   MINIMAP_VERSION: "24.3.0"
   MINECRAFT_VERSION: "1.12.2"
   MINECRAFT_VERSION_SHORT: "1.12"

.github/workflows/gradle.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 env:
-  WORLDMAP_VERSION: "1.38.8"
+  WORLDMAP_VERSION: "1.39.0"
   MINIMAP_VERSION: "24.3.0"
   MINECRAFT_VERSION: "1.12.2"
   MINECRAFT_VERSION_SHORT: "1.12"

build.gradle

@@ -114,7 +114,7 @@ dependencies {
     jarLibs 'com.github.ben-manes.caffeine:caffeine:2.9.3'
     jarLibs 'org.xerial:sqlite-jdbc:3.45.0.0'
 
-    implementation(fg.deobf("maven.modrinth:xaeros-world-map:1.38.8_Forge_1.12"))
+    implementation(fg.deobf("maven.modrinth:xaeros-world-map:1.39.0_Forge_1.12"))
     implementation(fg.deobf("maven.modrinth:xaeros-minimap:24.3.0_Forge_1.12"))
     implementation(fg.deobf('cabaletta:baritone-deobf-unoptimized-mcp-dev:1.2')).setChanging(true)
     compileOnly(fg.deobf("curse.maven:waystones-245755:2859589"))

src/main/java/xaeroplus/XaeroPlus.java

@@ -18,7 +18,7 @@
         modid = XaeroPlus.MODID,
         name = XaeroPlus.NAME,
         version = XaeroPlus.VERSION,
-        dependencies = "after:xaerominimap;after:xaerobetterpvp;required-after:xaeroworldmap@[1.38.8];"
+        dependencies = "after:xaerominimap;after:xaerobetterpvp;required-after:xaeroworldmap@[1.39.0];"
 )
 public class XaeroPlus {
     public static final String MODID = "xaeroplus";

src/main/java/xaeroplus/mixin/client/MixinMapProcessor.java

@@ -168,8 +168,8 @@ public abstract class MixinMapProcessor {
 
     @Shadow private OverlayManager overlayManager;
 
-    @Inject(method = "getMainId", at = @At("HEAD"), cancellable = true)
-    private void getMainId(boolean rootFolderFormat, boolean preIP6Fix, CallbackInfoReturnable<String> cir) {
+    @Inject(method = "getMainId(I)Ljava/lang/String;", at = @At("HEAD"), cancellable = true)
+    private void getMainId(final int version, final CallbackInfoReturnable<String> cir) {
         DataFolderResolveUtil.resolveDataFolder(cir);
     }
 

src/main/java/xaeroplus/mixin/client/MixinMinimapFBORenderer.java

@@ -32,6 +32,7 @@
 import xaero.common.misc.Misc;
 import xaero.common.misc.OptimizedMath;
 import xaero.common.settings.ModSettings;
+import xaero.hud.compat.mods.ImmediatelyFastHelper;
 import xaero.hud.minimap.Minimap;
 import xaero.hud.minimap.MinimapLogs;
 import xaeroplus.settings.XaeroPlusSettingRegistry;
@@ -147,6 +148,7 @@ public void renderChunksToFBO(
         int offsetX = xFloored & 63;
         int offsetZ = zFloored & 63;
         boolean zooming = (double)((int)this.zoom) != this.zoom;
+        ImmediatelyFastHelper.triggerBatchingBuffersFlush();
         this.scalingFramebuffer.bindFramebuffer(true);
         GL11.glClear(16640);
         GlStateManager.enableTexture2D();
@@ -357,6 +359,7 @@ public void renderChunksToFBO(
                         halfWView
                 );
         GlStateManager.popMatrix();
+        ImmediatelyFastHelper.triggerBatchingBuffersFlush();
         this.rotationFramebuffer.unbindFramebuffer();
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
         GlStateManager.disableBlend();

src/main/java/xaeroplus/mixin/client/MixinWaypointsManager.java

@@ -75,7 +75,7 @@ public boolean isUsingDefaultTeleportCommand(final WaypointWorldRootContainer in
         return !crossDimTeleport;
     }
 
-    @Inject(method = "getMainContainer", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "getMainContainer(I)Ljava/lang/String;", at = @At("HEAD"), cancellable = true)
     private void getMainContainer(CallbackInfoReturnable<String> cir) {
         DataFolderResolveUtil.resolveDataFolder(cir);
     }

src/main/resources/mixins.xaeroplus.json

@@ -41,7 +41,6 @@
     "MixinPixelBuffers",
     "MixinRadarRenderContext",
     "MixinRadarRenderProvider",
-    "MixinRegionTexture",
     "MixinSupportXaeroMinimap",
     "MixinSupportXaeroWorldmap",
     "MixinWaypoint",