Skip to content

Commit

Permalink
Revert "fix render system convention violations"
Browse files Browse the repository at this point in the history 
This reverts commit 3fdbc96.
  • Loading branch information
@ix0rai
ix0rai committed Aug 23, 2024
1 parent 3fdbc96 commit 99e839a
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
FIELD MAX_SUPPORTED_TEXTURE_SIZE maxSupportedTextureSize I
FIELD RENDER_THREAD_TESSELATOR RENDER_THREAD_TESSELLATOR Lnet/minecraft/unmapped/C_hiiunyvh;
FIELD modelViewStack MODEL_VIEW_STACK Lorg/joml/Matrix4fStack;
FIELD pollEventsWaitStart POLL_EVENTS_WAIT_START Ljava/util/concurrent/atomic/AtomicLong;
FIELD pollingEvents POLLING_EVENTS Ljava/util/concurrent/atomic/AtomicBoolean;
FIELD recordingQueue RECORDING_QUEUE Ljava/util/concurrent/ConcurrentLinkedQueue;
FIELD shaderColor SHADER_COLOR [F
FIELD shaderLightDirections SHADER_LIGHT_DIRECTIONS [Lorg/joml/Vector3f;
Expand Down

1 comment on commit 99e839a

@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 99e839a, 20 file(s) were updated with 46 line(s) added and 47 removed compared to the latest Quilt Mappings version.

View the diff here: 
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-23 04:11:14.047746240 +0000
+++ namedSrc/com/mojang/blaze3d/platform/GlStateManager.java	2024-08-23 04:10:04.819465373 +0000
@@ -130,9 +130,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/systems/RenderSystem.java namedSrc/com/mojang/blaze3d/systems/RenderSystem.java
--- namedTargetSrc/com/mojang/blaze3d/systems/RenderSystem.java	2024-08-23 04:11:14.003746060 +0000
+++ namedSrc/com/mojang/blaze3d/systems/RenderSystem.java	2024-08-23 04:10:04.771465170 +0000
@@ -345,9 +345,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);
    }
 
    /**
@@ -644,9 +644,9 @@
     * @mapping {@literal hashed setShaderFog Lcom/mojang/blaze3d/systems/RenderSystem;setShaderFog(Lnet/minecraft/unmapped/C_vidgpspy;)V}
     * @mapping {@literal named setShaderFog Lcom/mojang/blaze3d/systems/RenderSystem;setShaderFog(Lnet/minecraft/client/render/FogParameters;)V}
     */
-   public static void setShaderFog(FogParameters fog) {
+   public static void setShaderFog(FogParameters arg) {
       assertOnRenderThread();
-      shaderFog = fog;
+      shaderFog = arg;
    }
 
    /**
diff -bur namedTargetSrc/com/mojang/blaze3d/texture/TextureUtil.java namedSrc/com/mojang/blaze3d/texture/TextureUtil.java
--- namedTargetSrc/com/mojang/blaze3d/texture/TextureUtil.java	2024-08-23 04:11:14.031746175 +0000
+++ namedSrc/com/mojang/blaze3d/texture/TextureUtil.java	2024-08-23 04:10:04.799465288 +0000
@@ -157,9 +157,9 @@
 
    /**
     * @mapping {@literal hashed writeAsPNG Lcom/mojang/blaze3d/platform/TextureUtil;writeAsPNG(Ljava/nio/file/Path;Ljava/lang/String;IIII)V}
-    * @mapping {@literal named writeAsPNG Lcom/mojang/blaze3d/texture/TextureUtil;writeAsPNG(Ljava/nio/file/Path;Ljava/lang/String;IIII)V}
+    * @mapping {@literal named writeAsPng Lcom/mojang/blaze3d/texture/TextureUtil;writeAsPng(Ljava/nio/file/Path;Ljava/lang/String;IIII)V}
     */
-   public static void writeAsPNG(Path path, String fileName, int textureId, int mipLevels, int width, int height) {
+   public static void writeAsPng(Path path, String fileName, int textureId, int mipLevels, int width, int height) {
       writeAsPNG(path, fileName, textureId, mipLevels, width, height, null);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/ParentElement.java namedSrc/net/minecraft/client/gui/ParentElement.java
--- namedTargetSrc/net/minecraft/client/gui/ParentElement.java	2024-08-23 04:11:13.871745521 +0000
+++ namedSrc/net/minecraft/client/gui/ParentElement.java	2024-08-23 04:10:04.611464490 +0000
@@ -153,7 +153,7 @@
     * Mapping not found
     */
    @Override
-   default void setFocused(boolean bl) {
+   default void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-08-23 04:11:13.995746027 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-08-23 04:10:04.759465119 +0000
@@ -1507,9 +1507,9 @@
        * Mapping not found
        */
       @Override
-      public void setFocused(boolean bl) {
-         super.setFocused(bl);
-         this.button.setFocused(bl);
+      public void setFocused(boolean focused) {
+         super.setFocused(focused);
+         this.button.setFocused(focused);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-08-23 04:11:14.023746141 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-08-23 04:10:04.791465255 +0000
@@ -447,8 +447,8 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      this.focused = bl;
+   public void setFocused(boolean focused) {
+      this.focused = focused;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-08-23 04:11:13.879745554 +0000
+++ namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-08-23 04:10:04.619464524 +0000
@@ -121,7 +121,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      ParentElement.super.setFocused(bl);
+   public void setFocused(boolean focused) {
+      ParentElement.super.setFocused(focused);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-08-23 04:11:13.975745946 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-08-23 04:10:04.735465017 +0000
@@ -342,9 +342,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
-      if (bl) {
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
+      if (focused) {
          this.focusTime = Util.getMeasuringTimeMs();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java namedSrc/net/minecraft/client/gui/widget/HeaderBar.java
--- namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-08-23 04:11:14.083746386 +0000
+++ namedSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-08-23 04:10:04.859465543 +0000
@@ -122,10 +122,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
       if (this.getFocused() != null) {
-         this.getFocused().setFocused(bl);
+         this.getFocused().setFocused(focused);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-08-23 04:11:13.787745178 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-08-23 04:10:04.511464065 +0000
@@ -896,7 +896,7 @@
        * @mapping {@literal named setFocused Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;setFocused(Z)V}
        */
       @Override
-      public void setFocused(boolean bl) {
+      public void setFocused(boolean focused) {
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-08-23 04:11:13.879745554 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-08-23 04:10:04.623464541 +0000
@@ -240,7 +240,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
+   public void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-08-23 04:11:14.031746175 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-08-23 04:10:04.803465305 +0000
@@ -684,7 +684,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
+   public void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java namedSrc/net/minecraft/client/gui/widget/SliderWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-08-23 04:11:13.775745130 +0000
+++ namedSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-08-23 04:10:04.499464014 +0000
@@ -151,9 +151,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
-      if (!bl) {
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
+      if (!focused) {
          this.mutable = false;
       } else {
          InputType lv = MinecraftClient.getInstance().getLastInputType();
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-08-23 04:11:13.811745277 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-08-23 04:10:04.539464184 +0000
@@ -736,10 +736,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      if (this.focusUnlocked || bl) {
-         super.setFocused(bl);
-         if (bl) {
+   public void setFocused(boolean focused) {
+      if (this.focusUnlocked || focused) {
+         super.setFocused(focused);
+         if (focused) {
             this.lastFocusTime = Util.getMeasuringTimeMs();
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/render/item/ItemRenderer.java namedSrc/net/minecraft/client/render/item/ItemRenderer.java
--- namedTargetSrc/net/minecraft/client/render/item/ItemRenderer.java	2024-08-23 04:11:13.803745244 +0000
+++ namedSrc/net/minecraft/client/render/item/ItemRenderer.java	2024-08-23 04:10:04.531464150 +0000
@@ -191,7 +191,7 @@
     * 
     * @param stack the item stack
     * @param modelTransformationMode the model transformation mode
-    * @param leftHanded {@code true} if the the model is rendered in the left hand, or {@code false} otherwise
+    * @param leftHanded {@code true} if the model is rendered in the left hand, or {@code false} otherwise
     * @param matrices the matrix stack
     * @param vertexConsumers the vertex consumers
     * @param light the lightmap coordinates
diff -bur namedTargetSrc/net/minecraft/client/render/SkyRenderer.java namedSrc/net/minecraft/client/render/SkyRenderer.java
--- namedTargetSrc/net/minecraft/client/render/SkyRenderer.java	2024-08-23 04:11:13.975745946 +0000
+++ namedSrc/net/minecraft/client/render/SkyRenderer.java	2024-08-23 04:10:04.735465017 +0000
@@ -184,7 +184,7 @@
     * @mapping {@literal named renderCelestialObjects Lnet/minecraft/client/render/SkyRenderer;renderCelestialObjects(Lnet/minecraft/client/util/math/MatrixStack;Lcom/mojang/blaze3d/vertex/Tessellator;FIFFLnet/minecraft/client/render/FogParameters;)V}
     */
    public void renderCelestialObjects(
-      MatrixStack matrices, Tessellator tessellator, float skyAngle, int moonPhase, float objectVisibility, float starBrightness, FogParameters fog
+      MatrixStack matrices, Tessellator tessellator, float skyAngle, int moonPhase, float objectVisibility, float starBrightness, FogParameters arg3
    ) {
       matrices.push();
       matrices.rotate(Axis.Y_POSITIVE.rotationDegrees(-90.0F));
@@ -192,7 +192,7 @@
       this.renderSun(objectVisibility, tessellator, matrices);
       this.renderMoon(moonPhase, objectVisibility, tessellator, matrices);
       if (starBrightness > 0.0F) {
-         this.renderStars(fog, starBrightness, matrices);
+         this.renderStars(arg3, starBrightness, matrices);
       }
 
       matrices.pop();
@@ -260,7 +260,7 @@
     * @mapping {@literal hashed m_oksqohzv Lnet/minecraft/unmapped/C_tltwgmmc;m_oksqohzv(Lnet/minecraft/unmapped/C_vidgpspy;FLnet/minecraft/unmapped/C_cnszsxvd;)V}
     * @mapping {@literal named renderStars Lnet/minecraft/client/render/SkyRenderer;renderStars(Lnet/minecraft/client/render/FogParameters;FLnet/minecraft/client/util/math/MatrixStack;)V}
     */
-   private void renderStars(FogParameters fog, float visibility, MatrixStack matrices) {
+   private void renderStars(FogParameters arg, float visibility, MatrixStack matrices) {
       Matrix4fStack matrix4fStack = RenderSystem.getModelViewStack();
       matrix4fStack.pushMatrix();
       matrix4fStack.mul(matrices.peek().getModel());
@@ -273,7 +273,7 @@
       this.stars.bind();
       this.stars.draw(matrix4fStack, RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
       VertexBuffer.unbind();
-      RenderSystem.setShaderFog(fog);
+      RenderSystem.setShaderFog(arg);
       RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
       RenderSystem.disableBlend();
       RenderSystem.defaultBlendFunc();
diff -bur namedTargetSrc/net/minecraft/client/texture/SpriteAtlasTexture.java namedSrc/net/minecraft/client/texture/SpriteAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/texture/SpriteAtlasTexture.java	2024-08-23 04:11:14.011746093 +0000
+++ namedSrc/net/minecraft/client/texture/SpriteAtlasTexture.java	2024-08-23 04:10:04.779465204 +0000
@@ -158,7 +158,7 @@
    @Override
    public void saveTo(Identifier textureId, Path directoryPath) throws IOException {
       String string = textureId.toUnderscoreSeparatedString();
-      TextureUtil.writeAsPNG(directoryPath, string, this.getGlId(), this.mipLevel, this.width, this.height);
+      TextureUtil.writeAsPng(directoryPath, string, this.getGlId(), this.mipLevel, this.width, this.height);
       dumpSpriteInfo(directoryPath, string, this.sprites);
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtIo.java namedSrc/net/minecraft/nbt/NbtIo.java
--- namedTargetSrc/net/minecraft/nbt/NbtIo.java	2024-08-23 04:11:13.787745178 +0000
+++ namedSrc/net/minecraft/nbt/NbtIo.java	2024-08-23 04:10:04.511464065 +0000
@@ -497,16 +497,15 @@
       }
 
       /**
-       * @mapping {@literal hashed writeUTF Lnet/minecraft/unmapped/C_plrkqquc$C_wbbhdkdn;writeUTF(Ljava/lang/String;)V}
-       * @mapping {@literal named writeUTF Lnet/minecraft/nbt/NbtIo$StringFallbackDataOutput;writeUTF(Ljava/lang/String;)V}
+       * Mapping not found
        */
       @Override
-      public void writeUTF(String string) throws IOException {
+      public void writeUtf(String string) throws IOException {
          try {
-            super.writeUTF(string);
+            super.writeUtf(string);
          } catch (UTFDataFormatException var3) {
             Util.logAndPause("Failed to write NBT String", var3);
-            super.writeUTF("");
+            super.writeUtf("");
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/util/DelegatingDataOutput.java namedSrc/net/minecraft/util/DelegatingDataOutput.java
--- namedTargetSrc/net/minecraft/util/DelegatingDataOutput.java	2024-08-23 04:11:13.847745423 +0000
+++ namedSrc/net/minecraft/util/DelegatingDataOutput.java	2024-08-23 04:10:04.579464353 +0000
@@ -128,9 +128,9 @@
 
    /**
     * @mapping {@literal hashed writeUTF Lnet/minecraft/unmapped/C_hydfible;writeUTF(Ljava/lang/String;)V}
-    * @mapping {@literal named writeUTF Lnet/minecraft/util/DelegatingDataOutput;writeUTF(Ljava/lang/String;)V}
+    * @mapping {@literal named writeUtf Lnet/minecraft/util/DelegatingDataOutput;writeUtf(Ljava/lang/String;)V}
     */
-   public void writeUTF(String string) throws IOException {
+   public void writeUtf(String string) throws IOException {
       this.delegate.writeUTF(string);
    }
 }
diff -bur namedTargetSrc/net/minecraft/world/RegistryWorldView.java namedSrc/net/minecraft/world/RegistryWorldView.java
--- namedTargetSrc/net/minecraft/world/RegistryWorldView.java	2024-08-23 04:11:14.043746223 +0000
+++ namedSrc/net/minecraft/world/RegistryWorldView.java	2024-08-23 04:10:04.811465340 +0000
@@ -35,8 +35,8 @@
     * Mapping not found
     */
    @Override
-   default boolean doesNotIntersectEntities(@Nullable Entity except, VoxelShape shape) {
-      return EntityView.super.doesNotIntersectEntities(except, shape);
+   default boolean doesNotIntersectEntities(@Nullable Entity entity, VoxelShape shape) {
+      return EntityView.super.doesNotIntersectEntities(entity, shape);
    }
 
    /**

Please sign in to comment.