Skip to content

Commit

Permalink
remove a lot of redundant blaze3d mappings
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Aug 20, 2024
1 parent a0102c2 commit 5e967f8
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 219 deletions.
2 changes: 1 addition & 1 deletion mappings/com/mojang/blaze3d/glfw/monitor/MonitorFactory.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CLASS net/minecraft/unmapped/C_kceozcrb com/mojang/blaze3d/glfw/monitor/MonitorFactory
METHOD createMonitor createMonitor (J)Lnet/minecraft/unmapped/C_ykheakec;
METHOD createMonitor (J)Lnet/minecraft/unmapped/C_ykheakec;
ARG 1 window
100 changes: 0 additions & 100 deletions mappings/com/mojang/blaze3d/platform/GlConst.mapping
View file

This file was deleted.

Loading

1 comment on commit 5e967f8

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 5e967f8, 5 file(s) were updated with 12 line(s) added and 12 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/com/mojang/blaze3d/framebuffer/Framebuffer.java namedSrc/com/mojang/blaze3d/framebuffer/Framebuffer.java
--- namedTargetSrc/com/mojang/blaze3d/framebuffer/Framebuffer.java	2024-08-20 20:45:19.588267613 +0000
+++ namedSrc/com/mojang/blaze3d/framebuffer/Framebuffer.java	2024-08-20 20:44:02.648016341 +0000
@@ -336,7 +336,7 @@
       ShaderProgram lv2 = (ShaderProgram)Objects.requireNonNull(lv.gameRenderer.blitScreenShader, "Blit shader not loaded");
       lv2.addSampler("InSampler", this.colorAttachment);
       lv2.bind();
-      BufferBuilder lv3 = RenderSystem.renderThreadTessellator().begin(VertexFormat.DrawMode.QUADS, VertexFormats.BLIT_SCREEN);
+      BufferBuilder lv3 = RenderSystem.renderThreadTesselator().begin(VertexFormat.DrawMode.QUADS, VertexFormats.BLIT_SCREEN);
       lv3.xyz(0.0F, 0.0F, 0.0F);
       lv3.xyz(1.0F, 0.0F, 0.0F);
       lv3.xyz(1.0F, 1.0F, 0.0F);
diff -bur namedTargetSrc/com/mojang/blaze3d/platform/GlStateManager.java namedSrc/com/mojang/blaze3d/platform/GlStateManager.java
--- namedTargetSrc/com/mojang/blaze3d/platform/GlStateManager.java	2024-08-20 20:45:19.684267933 +0000
+++ namedSrc/com/mojang/blaze3d/platform/GlStateManager.java	2024-08-20 20:44:02.784016838 +0000
@@ -131,9 +131,9 @@
     * @mapping {@literal hashed _scissorBox Lcom/mojang/blaze3d/platform/GlStateManager;_scissorBox(IIII)V}
     * @mapping {@literal named _scissorBox Lcom/mojang/blaze3d/platform/GlStateManager;_scissorBox(IIII)V}
     */
-   public static void _scissorBox(int i, int j, int k, int l) {
+   public static void _scissorBox(int x, int y, int width, int height) {
       RenderSystem.assertOnRenderThreadOrInit();
-      GL20.glScissor(i, j, k, l);
+      GL20.glScissor(x, y, width, height);
    }
 
    /**
diff -bur namedTargetSrc/com/mojang/blaze3d/platform/GLX.java namedSrc/com/mojang/blaze3d/platform/GLX.java
--- namedTargetSrc/com/mojang/blaze3d/platform/GLX.java	2024-08-20 20:45:19.636267773 +0000
+++ namedSrc/com/mojang/blaze3d/platform/GLX.java	2024-08-20 20:44:02.716016589 +0000
@@ -160,7 +160,7 @@
          GlStateManager._depthMask(false);
          GlStateManager._disableCull();
          RenderSystem.setShader(GameRenderer::getRenderTypeLinesShader);
-         Tessellator lv = RenderSystem.renderThreadTessellator();
+         Tessellator lv = RenderSystem.renderThreadTesselator();
          BufferBuilder lv2 = lv.begin(VertexFormat.DrawMode.LINES, VertexFormats.LINES);
          RenderSystem.lineWidth(4.0F);
          if (drawX) {
diff -bur namedTargetSrc/com/mojang/blaze3d/systems/RenderSystem.java namedSrc/com/mojang/blaze3d/systems/RenderSystem.java
--- namedTargetSrc/com/mojang/blaze3d/systems/RenderSystem.java	2024-08-20 20:45:19.652267826 +0000
+++ namedSrc/com/mojang/blaze3d/systems/RenderSystem.java	2024-08-20 20:44:02.740016677 +0000
@@ -60,9 +60,9 @@
    private static final ConcurrentLinkedQueue<RenderCall> RECORDING_QUEUE = Queues.newConcurrentLinkedQueue();
    /**
     * @mapping {@literal hashed RENDER_THREAD_TESSELATOR Lcom/mojang/blaze3d/systems/RenderSystem;RENDER_THREAD_TESSELATOR:Lnet/minecraft/unmapped/C_hiiunyvh;}
-    * @mapping {@literal named RENDER_THREAD_TESSELLATOR Lcom/mojang/blaze3d/systems/RenderSystem;RENDER_THREAD_TESSELLATOR:Lcom/mojang/blaze3d/vertex/Tessellator;}
+    * @mapping {@literal named RENDER_THREAD_TESSELATOR Lcom/mojang/blaze3d/systems/RenderSystem;RENDER_THREAD_TESSELATOR:Lcom/mojang/blaze3d/vertex/Tessellator;}
     */
-   private static final Tessellator RENDER_THREAD_TESSELLATOR = new Tessellator(1536);
+   private static final Tessellator RENDER_THREAD_TESSELATOR = new Tessellator(1536);
    /**
     * @mapping {@literal hashed MINIMUM_ATLAS_TEXTURE_SIZE Lcom/mojang/blaze3d/systems/RenderSystem;MINIMUM_ATLAS_TEXTURE_SIZE:I}
     * @mapping {@literal named MINIMUM_ATLAS_TEXTURE_SIZE Lcom/mojang/blaze3d/systems/RenderSystem;MINIMUM_ATLAS_TEXTURE_SIZE:I}
@@ -347,9 +347,9 @@
     * @mapping {@literal hashed enableScissor Lcom/mojang/blaze3d/systems/RenderSystem;enableScissor(IIII)V}
     * @mapping {@literal named enableScissor Lcom/mojang/blaze3d/systems/RenderSystem;enableScissor(IIII)V}
     */
-   public static void enableScissor(int i, int j, int k, int l) {
+   public static void enableScissor(int x, int y, int width, int height) {
       GlStateManager._enableScissorTest();
-      GlStateManager._scissorBox(i, j, k, l);
+      GlStateManager._scissorBox(x, y, width, height);
    }
 
    /**
@@ -1105,11 +1105,11 @@
 
    /**
     * @mapping {@literal hashed renderThreadTesselator Lcom/mojang/blaze3d/systems/RenderSystem;renderThreadTesselator()Lnet/minecraft/unmapped/C_hiiunyvh;}
-    * @mapping {@literal named renderThreadTessellator Lcom/mojang/blaze3d/systems/RenderSystem;renderThreadTessellator()Lcom/mojang/blaze3d/vertex/Tessellator;}
+    * @mapping {@literal named renderThreadTesselator Lcom/mojang/blaze3d/systems/RenderSystem;renderThreadTesselator()Lcom/mojang/blaze3d/vertex/Tessellator;}
     */
-   public static Tessellator renderThreadTessellator() {
+   public static Tessellator renderThreadTesselator() {
       assertOnRenderThread();
-      return RENDER_THREAD_TESSELLATOR;
+      return RENDER_THREAD_TESSELATOR;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/LightmapTextureManager.java namedSrc/net/minecraft/client/render/LightmapTextureManager.java
--- namedTargetSrc/net/minecraft/client/render/LightmapTextureManager.java	2024-08-20 20:45:19.536267440 +0000
+++ namedSrc/net/minecraft/client/render/LightmapTextureManager.java	2024-08-20 20:44:02.592016137 +0000
@@ -229,7 +229,7 @@
             this.f_cnaeeihj.getUniformOrDefault("BrightnessFactor").setFloat(Math.max(0.0F, s - k));
             this.f_cnaeeihj.bind();
             this.f_ekwpgxae.beginWrite(true);
-            BufferBuilder lv2 = RenderSystem.renderThreadTessellator().begin(VertexFormat.DrawMode.QUADS, VertexFormats.BLIT_SCREEN);
+            BufferBuilder lv2 = RenderSystem.renderThreadTesselator().begin(VertexFormat.DrawMode.QUADS, VertexFormats.BLIT_SCREEN);
             lv2.xyz(0.0F, 0.0F, 0.0F);
             lv2.xyz(1.0F, 0.0F, 0.0F);
             lv2.xyz(1.0F, 1.0F, 0.0F);

Please sign in to comment.