Merge branch '1.19.4' into 1.19.2

rfresh2 · Oct 2, 2024 · b8fefdd · b8fefdd
2 parents 9c8af5f + 56418d1
commit b8fefdd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/common/src/main/java/xaeroplus/feature/render/buffered/BufferedComponent.java b/common/src/main/java/xaeroplus/feature/render/buffered/BufferedComponent.java
@@ -94,7 +94,12 @@ private void renderBufferedTexture(final int textureId) {
         RenderSystem.disableDepthTest();
         RenderSystem.depthMask(false);
         RenderSystem.enableBlend();
-        RenderSystem.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
+        RenderSystem.blendFuncSeparate(
+            GlStateManager.SourceFactor.SRC_ALPHA,
+            GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA,
+            GlStateManager.SourceFactor.ONE,
+            GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA
+        );
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
         RenderSystem.setShaderTexture(0, textureId);
@@ -106,6 +111,5 @@ private void renderBufferedTexture(final int textureId) {
         model.draw(modelViewMatrix);
         RenderSystem.depthMask(true);
         RenderSystem.enableDepthTest();
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
     }
 }
diff --git a/common/src/main/java/xaeroplus/mixin/client/MixinMinimapRenderer.java b/common/src/main/java/xaeroplus/mixin/client/MixinMinimapRenderer.java
@@ -224,7 +224,7 @@ public int modifyArrowOffsetY(final int offsetY) {
     @WrapOperation(method = "renderMinimap", at = @At(
         value = "INVOKE",
         target = "Lcom/mojang/blaze3d/systems/RenderSystem;blendFuncSeparate(Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;)V"
-    ), remap = true) // $REMAP
+    ), remap = true)
     public void correctBlendingForFpsLimiter(final GlStateManager.SourceFactor sourceFactor, final GlStateManager.DestFactor destFactor, final GlStateManager.SourceFactor sourceFactor2, final GlStateManager.DestFactor destFactor2, final Operation<Void> original) {
         if (Settings.REGISTRY.minimapFpsLimiter.get()) {
             // todo: when minimap opacity is not set to 100 this is slightly different than without fps limiter