Merge branch '1.20.4' into 1.20.6

# Conflicts: # settings.gradle.kts
rfresh2 · Feb 1, 2025 · 9cea13a · 9cea13a
2 parents b05ff1e + 12a3a6f
commit 9cea13a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/common/src/main/java/xaeroplus/feature/render/DrawManager.java b/common/src/main/java/xaeroplus/feature/render/DrawManager.java
@@ -116,6 +116,7 @@ public synchronized void drawMinimapLines(
         final PoseStack matrixStack,
         final MultiBufferSource.BufferSource renderTypeBuffers
     ) {
+        MinimapShaders.ensureShaders();
         for (int i = 0; i < sortedLineKeySet.size(); i++) {
             var k = sortedLineKeySet.get(i);
             if (k == null) continue;
@@ -244,6 +245,7 @@ public synchronized void drawWorldMapLines(
         double fboScale,
         final MultiBufferSource.BufferSource renderTypeBuffers
     ) {
+        MinimapShaders.ensureShaders();
         var mc = Minecraft.getInstance();
         MinimapShaders.FRAMEBUFFER_LINES.setFrameSize(mc.getWindow().getWidth(), mc.getWindow().getHeight());
         for (int i = 0; i < sortedLineKeySet.size(); i++) {

diff --git a/common/src/main/java/xaeroplus/mixin/client/MixinMinimapFBORenderer.java b/common/src/main/java/xaeroplus/mixin/client/MixinMinimapFBORenderer.java
@@ -230,6 +230,7 @@ public void drawMinimapFeaturesCaveMode(final MultiTextureRenderTypeRendererProv
                                             @Local(name = "renderTypeBuffers") MultiBufferSource.BufferSource renderTypeBuffers
     ) {
         original.call(instance, renderer);
+        MinimapShaders.FRAMEBUFFER_LINES.setFrameSize((float)this.scalingFramebuffer.viewWidth, (float)this.scalingFramebuffer.viewHeight);
         int mapX = xFloored >> 4;
         int mapZ = zFloored >> 4;
         int chunkX = mapX >> 2;

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
 	}
 }
 gradle.extra.apply {
-	set("mod_version", "2.25.3")
+	set("mod_version", "2.25.4")
 	set("minecraft_version", "1.20.6")
 	set("parchment_version", "2024.06.16")
     set("worldmap_version_fabric", "1.39.2")