Enforce text layer draw order

Fixes #287 Fixes #288
RaphiMC · Nov 9, 2024 · b91d6f7 · b91d6f7
1 parent 32ca512
commit b91d6f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 54 deletions.
diff --git a/common/src/main/java/net/raphimc/immediatelyfast/feature/core/BatchableBufferSource.java b/common/src/main/java/net/raphimc/immediatelyfast/feature/core/BatchableBufferSource.java
@@ -211,6 +211,14 @@ protected int getLayerOrder(final RenderLayer layer) {
                     }
                 } else if (textureId.equals(TexturedRenderLayers.ARMOR_TRIMS_ATLAS_TEXTURE)) {
                     return 1;
+                } else if (layer.name.startsWith("text")) {
+                    // Draws vanilla text over custom font layers
+                    // Fixes https://github.com/RaphiMC/ImmediatelyFast/issues/81, https://github.com/RaphiMC/ImmediatelyFast/issues/287, https://github.com/RaphiMC/ImmediatelyFast/issues/288
+                    if (textureId.getNamespace().equals("minecraft")) {
+                        return 2;
+                    } else {
+                        return 1;
+                    }
                 }
             }
         }

diff --git a/...va/net/raphimc/immediatelyfast/injection/mixins/core/compat/MixinTextRenderer_Drawer.java b/...va/net/raphimc/immediatelyfast/injection/mixins/core/compat/MixinTextRenderer_Drawer.java
diff --git a/common/src/main/resources/immediatelyfast-common.mixins.json b/common/src/main/resources/immediatelyfast-common.mixins.json
@@ -13,7 +13,6 @@
     "core.MixinWindow",
     "core.compat.MixinGameRenderer",
     "core.compat.MixinTextDisplayEntityRenderer",
-    "core.compat.MixinTextRenderer_Drawer",
     "disable_error_checking.MixinGL11",
     "fast_buffer_upload.MixinVertexBuffer",
     "fast_text_lookup.MixinTextRenderer_Drawer",