Skip to content

Commit

Permalink
Update mappings/net/minecraft/util/DelegatingDataOutput.mapping
Browse files Browse the repository at this point in the history 
Co-authored-by: Will <supersaiyansubtlety@gmail.com>
  • Loading branch information
@ix0rai @supersaiyansubtlety
ix0rai and supersaiyansubtlety authored Aug 21, 2024
1 parent 7e2a779 commit 053757a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/util/DelegatingDataOutput.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ CLASS net/minecraft/unmapped/C_hydfible net/minecraft/util/DelegatingDataOutput
ARG 1 l
METHOD writeShort (I)V
ARG 1 i
METHOD writeUTF (Ljava/lang/String;)V
METHOD writeUTF writeUtf (Ljava/lang/String;)V
ARG 1 string

1 comment on commit 053757a

@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 053757a, 12 file(s) were updated with 34 line(s) added and 36 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-21 04:20:06.062220299 +0000
+++ namedSrc/com/mojang/blaze3d/framebuffer/Framebuffer.java	2024-08-21 04:18:58.402007528 +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-21 04:20:06.166220633 +0000
+++ namedSrc/com/mojang/blaze3d/platform/GlStateManager.java	2024-08-21 04:18:58.542007984 +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-21 04:20:06.122220492 +0000
+++ namedSrc/com/mojang/blaze3d/platform/GLX.java	2024-08-21 04:18:58.474007762 +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-21 04:20:06.138220543 +0000
+++ namedSrc/com/mojang/blaze3d/systems/RenderSystem.java	2024-08-21 04:18:58.494007827 +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/entity/EntityRenderer.java namedSrc/net/minecraft/client/render/entity/EntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-08-21 04:20:06.034220208 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-08-21 04:18:58.358007385 +0000
@@ -289,8 +289,7 @@
    }
 
    /**
-    * @mapping {@literal hashed m_idqrsxfa Lnet/minecraft/unmapped/C_oddtxnnw;m_idqrsxfa(Lnet/minecraft/unmapped/C_vptppxob;)F}
-    * @mapping {@literal named m_idqrsxfa Lnet/minecraft/client/render/entity/EntityRenderer;m_idqrsxfa(Lnet/minecraft/unmapped/C_vptppxob;)F}
+    * Mapping not found
     */
    protected float m_idqrsxfa(S arg) {
       return this.shadowRadius;
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-21 04:20:05.950219939 +0000
+++ namedSrc/net/minecraft/client/render/item/ItemRenderer.java	2024-08-21 04:18:58.250007034 +0000
@@ -195,7 +195,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/LightmapTextureManager.java namedSrc/net/minecraft/client/render/LightmapTextureManager.java
--- namedTargetSrc/net/minecraft/client/render/LightmapTextureManager.java	2024-08-21 04:20:06.022220170 +0000
+++ namedSrc/net/minecraft/client/render/LightmapTextureManager.java	2024-08-21 04:18:58.338007320 +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);
diff -bur namedTargetSrc/net/minecraft/nbt/NbtByteArray.java namedSrc/net/minecraft/nbt/NbtByteArray.java
--- namedTargetSrc/net/minecraft/nbt/NbtByteArray.java	2024-08-21 04:20:06.182220684 +0000
+++ namedSrc/net/minecraft/nbt/NbtByteArray.java	2024-08-21 04:18:58.570008075 +0000
@@ -227,10 +227,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_tzckaasl Lnet/minecraft/unmapped/C_umipmxwv;m_tzckaasl(ILnet/minecraft/unmapped/C_pwgutliu;)V}
-    * @mapping {@literal named add Lnet/minecraft/nbt/NbtByteArray;add(ILnet/minecraft/nbt/NbtByte;)V}
+    * @mapping {@literal hashed m_tqepkmcc Lnet/minecraft/unmapped/C_umipmxwv;m_tqepkmcc(ILnet/minecraft/unmapped/C_pwgutliu;)V}
+    * @mapping {@literal named m_tqepkmcc Lnet/minecraft/nbt/NbtByteArray;m_tqepkmcc(ILnet/minecraft/nbt/NbtByte;)V}
     */
-   public void add(int i, NbtByte arg) {
+   public void m_tqepkmcc(int i, NbtByte arg) {
       this.value = ArrayUtils.add(this.value, i, arg.byteValue());
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtIntArray.java namedSrc/net/minecraft/nbt/NbtIntArray.java
--- namedTargetSrc/net/minecraft/nbt/NbtIntArray.java	2024-08-21 04:20:06.042220235 +0000
+++ namedSrc/net/minecraft/nbt/NbtIntArray.java	2024-08-21 04:18:58.378007450 +0000
@@ -235,9 +235,9 @@
 
    /**
     * @mapping {@literal hashed m_pshfcznb Lnet/minecraft/unmapped/C_qkxiqejc;m_pshfcznb(ILnet/minecraft/unmapped/C_mtwrptzz;)V}
-    * @mapping {@literal named add Lnet/minecraft/nbt/NbtIntArray;add(ILnet/minecraft/nbt/NbtInt;)V}
+    * @mapping {@literal named m_tqepkmcc Lnet/minecraft/nbt/NbtIntArray;m_tqepkmcc(ILnet/minecraft/nbt/NbtInt;)V}
     */
-   public void add(int i, NbtInt arg) {
+   public void m_tqepkmcc(int i, NbtInt arg) {
       this.value = ArrayUtils.add(this.value, i, arg.intValue());
    }
 
@@ -269,9 +269,9 @@
 
    /**
     * @mapping {@literal hashed m_nefcehdo Lnet/minecraft/unmapped/C_qkxiqejc;m_nefcehdo(I)Lnet/minecraft/unmapped/C_mtwrptzz;}
-    * @mapping {@literal named remove Lnet/minecraft/nbt/NbtIntArray;remove(I)Lnet/minecraft/nbt/NbtInt;}
+    * @mapping {@literal named m_dllfwufy Lnet/minecraft/nbt/NbtIntArray;m_dllfwufy(I)Lnet/minecraft/nbt/NbtInt;}
     */
-   public NbtInt remove(int i) {
+   public NbtInt m_dllfwufy(int i) {
       int j = this.value[i];
       this.value = ArrayUtils.remove(this.value, i);
       return NbtInt.of(j);
diff -bur namedTargetSrc/net/minecraft/nbt/NbtIo.java namedSrc/net/minecraft/nbt/NbtIo.java
--- namedTargetSrc/net/minecraft/nbt/NbtIo.java	2024-08-21 04:20:05.934219888 +0000
+++ namedSrc/net/minecraft/nbt/NbtIo.java	2024-08-21 04:18:58.230006969 +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/nbt/NbtLongArray.java namedSrc/net/minecraft/nbt/NbtLongArray.java
--- namedTargetSrc/net/minecraft/nbt/NbtLongArray.java	2024-08-21 04:20:05.938219900 +0000
+++ namedSrc/net/minecraft/nbt/NbtLongArray.java	2024-08-21 04:18:58.238006995 +0000
@@ -234,19 +234,19 @@
 
    /**
     * @mapping {@literal hashed m_cwozgxhz Lnet/minecraft/unmapped/C_ojdqftoi;m_cwozgxhz(ILnet/minecraft/unmapped/C_mbybaqku;)Lnet/minecraft/unmapped/C_mbybaqku;}
-    * @mapping {@literal named set Lnet/minecraft/nbt/NbtLongArray;set(ILnet/minecraft/nbt/NbtLong;)Lnet/minecraft/nbt/NbtLong;}
+    * @mapping {@literal named m_aqofzuem Lnet/minecraft/nbt/NbtLongArray;m_aqofzuem(ILnet/minecraft/nbt/NbtLong;)Lnet/minecraft/nbt/NbtLong;}
     */
-   public NbtLong set(int i, NbtLong arg) {
+   public NbtLong m_aqofzuem(int i, NbtLong arg) {
       long l = this.value[i];
       this.value[i] = arg.longValue();
       return NbtLong.of(l);
    }
 
    /**
-    * @mapping {@literal hashed add Lnet/minecraft/unmapped/C_ojdqftoi;add(ILnet/minecraft/unmapped/C_mbybaqku;)V}
-    * @mapping {@literal named add Lnet/minecraft/nbt/NbtLongArray;add(ILnet/minecraft/nbt/NbtLong;)V}
+    * @mapping {@literal hashed m_udhbstkf Lnet/minecraft/unmapped/C_ojdqftoi;m_udhbstkf(ILnet/minecraft/unmapped/C_mbybaqku;)V}
+    * @mapping {@literal named m_tqepkmcc Lnet/minecraft/nbt/NbtLongArray;m_tqepkmcc(ILnet/minecraft/nbt/NbtLong;)V}
     */
-   public void add(int i, NbtLong arg) {
+   public void m_tqepkmcc(int i, NbtLong arg) {
       this.value = ArrayUtils.add(this.value, i, arg.longValue());
    }
 
@@ -278,9 +278,9 @@
 
    /**
     * @mapping {@literal hashed m_huyxmfam Lnet/minecraft/unmapped/C_ojdqftoi;m_huyxmfam(I)Lnet/minecraft/unmapped/C_mbybaqku;}
-    * @mapping {@literal named remove Lnet/minecraft/nbt/NbtLongArray;remove(I)Lnet/minecraft/nbt/NbtLong;}
+    * @mapping {@literal named m_dllfwufy Lnet/minecraft/nbt/NbtLongArray;m_dllfwufy(I)Lnet/minecraft/nbt/NbtLong;}
     */
-   public NbtLong remove(int i) {
+   public NbtLong m_dllfwufy(int i) {
       long l = this.value[i];
       this.value = ArrayUtils.remove(this.value, i);
       return NbtLong.of(l);
diff -bur namedTargetSrc/net/minecraft/util/DelegatingDataOutput.java namedSrc/net/minecraft/util/DelegatingDataOutput.java
--- namedTargetSrc/net/minecraft/util/DelegatingDataOutput.java	2024-08-21 04:20:05.990220068 +0000
+++ namedSrc/net/minecraft/util/DelegatingDataOutput.java	2024-08-21 04:18:58.298007189 +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);
    }
 }

Please sign in to comment.