Skip to content

Commit

Permalink
Update mappings/net/minecraft/nbt/NbtOps.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 7, 2024
1 parent 0e0aae5 commit 3944dcb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion mappings/net/minecraft/nbt/NbtOps.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ CLASS net/minecraft/unmapped/C_fybaywjo net/minecraft/nbt/NbtOps
ARG 1 element
METHOD m_fjtdnzmx accept (Ljava/lang/Iterable;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;
ARG 1 elements
METHOD m_gxpktbdp acceptAll (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;
METHOD m_gxpktbdp accept (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;
ARG 1 elements
METHOD m_mlztdcvi getResult ()Lnet/minecraft/unmapped/C_oivssbvb;
CLASS C_rkolbfzv IntListCollector
FIELD f_pvqmoapp values Lit/unimi/dsi/fastutil/ints/IntArrayList;
Expand Down

3 comments on commit 3944dcb

@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 3944dcb, 844 file(s) were updated with 9808 line(s) added and 10729 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/com/mojang/blaze3d/font/Font.java namedSrc/com/mojang/blaze3d/font/Font.java
--- namedTargetSrc/com/mojang/blaze3d/font/Font.java	2024-08-07 03:59:24.129182400 +0000
+++ namedSrc/com/mojang/blaze3d/font/Font.java	2024-08-07 03:58:15.197046486 +0000
@@ -3,6 +3,7 @@
 import it.unimi.dsi.fastutil.ints.IntSet;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.unmapped.C_odvtolcn;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -12,10 +13,9 @@
 @Environment(EnvType.CLIENT)
 public interface Font extends AutoCloseable {
    /**
-    * @mapping {@literal hashed f_yricfcax Lnet/minecraft/unmapped/C_wywmjnuh;f_yricfcax:F}
-    * @mapping {@literal named BASELINE Lcom/mojang/blaze3d/font/Font;BASELINE:F}
+    * Mapping not found
     */
-   float BASELINE = 7.0F;
+   float f_yricfcax = 7.0F;
 
    /**
     * @mapping {@literal hashed close Lnet/minecraft/unmapped/C_wywmjnuh;close()V}
@@ -43,13 +43,12 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_wywmjnuh$C_bavmfosz}
-    * @mapping {@literal named com/mojang/blaze3d/font/Font$Filtered}
+    * @mapping {@literal named com/mojang/blaze3d/font/Font$C_bavmfosz}
     */
    @Environment(EnvType.CLIENT)
-   public static record Filtered(Font provider, FontOption.Filter filter) implements AutoCloseable {
+   public static record C_bavmfosz(Font provider, C_odvtolcn.C_anbilzsz filter) implements AutoCloseable {
       /**
-       * @mapping {@literal hashed close Lnet/minecraft/unmapped/C_wywmjnuh$C_bavmfosz;close()V}
-       * @mapping {@literal named close Lcom/mojang/blaze3d/font/Font$Filtered;close()V}
+       * Mapping not found
        */
       public void close() {
          this.provider.close();
Only in namedTargetSrc/com/mojang/blaze3d/font: FontOption.java
diff -bur namedTargetSrc/com/mojang/blaze3d/font/SheetGlyphInfo.java namedSrc/com/mojang/blaze3d/font/SheetGlyphInfo.java
--- namedTargetSrc/com/mojang/blaze3d/font/SheetGlyphInfo.java	2024-08-07 03:59:24.137182415 +0000
+++ namedSrc/com/mojang/blaze3d/font/SheetGlyphInfo.java	2024-08-07 03:58:15.205046502 +0000
@@ -44,7 +44,7 @@
     * @mapping {@literal named getLeft Lcom/mojang/blaze3d/font/SheetGlyphInfo;getLeft()F}
     */
    default float getLeft() {
-      return this.getBearingLeft();
+      return this.m_auvmtwdj();
    }
 
    /**
@@ -56,34 +56,30 @@
    }
 
    /**
-    * @mapping {@literal hashed m_ercrbpll Lnet/minecraft/unmapped/C_etoytjqu;m_ercrbpll()F}
-    * @mapping {@literal named getTop Lcom/mojang/blaze3d/font/SheetGlyphInfo;getTop()F}
+    * Mapping not found
     */
-   default float getTop() {
-      return 7.0F - this.getBearingTop();
+   default float m_ercrbpll() {
+      return 7.0F - this.m_pvznkspl();
    }
 
    /**
-    * @mapping {@literal hashed m_pgevbsgb Lnet/minecraft/unmapped/C_etoytjqu;m_pgevbsgb()F}
-    * @mapping {@literal named getBottom Lcom/mojang/blaze3d/font/SheetGlyphInfo;getBottom()F}
+    * Mapping not found
     */
-   default float getBottom() {
-      return this.getTop() + (float)this.getHeight() / this.getOversample();
+   default float m_pgevbsgb() {
+      return this.m_ercrbpll() + (float)this.getHeight() / this.getOversample();
    }
 
    /**
-    * @mapping {@literal hashed m_auvmtwdj Lnet/minecraft/unmapped/C_etoytjqu;m_auvmtwdj()F}
-    * @mapping {@literal named getBearingLeft Lcom/mojang/blaze3d/font/SheetGlyphInfo;getBearingLeft()F}
+    * Mapping not found
     */
-   default float getBearingLeft() {
+   default float m_auvmtwdj() {
       return 0.0F;
    }
 
    /**
-    * @mapping {@literal hashed m_pvznkspl Lnet/minecraft/unmapped/C_etoytjqu;m_pvznkspl()F}
-    * @mapping {@literal named getBearingTop Lcom/mojang/blaze3d/font/SheetGlyphInfo;getBearingTop()F}
+    * Mapping not found
     */
-   default float getBearingTop() {
+   default float m_pvznkspl() {
       return 7.0F;
    }
 }
diff -bur namedTargetSrc/com/mojang/blaze3d/font/TrueTypeFont.java namedSrc/com/mojang/blaze3d/font/TrueTypeFont.java
--- namedTargetSrc/com/mojang/blaze3d/font/TrueTypeFont.java	2024-08-07 03:59:24.129182400 +0000
+++ namedSrc/com/mojang/blaze3d/font/TrueTypeFont.java	2024-08-07 03:58:15.197046486 +0000
@@ -34,11 +34,10 @@
    @Nullable
    private ByteBuffer buffer;
    /**
-    * @mapping {@literal hashed f_bjfvqris Lnet/minecraft/unmapped/C_zsraftqh;f_bjfvqris:Lorg/lwjgl/util/freetype/FT_Face;}
-    * @mapping {@literal named face Lcom/mojang/blaze3d/font/TrueTypeFont;face:Lorg/lwjgl/util/freetype/FT_Face;}
+    * Mapping not found
     */
    @Nullable
-   private FT_Face face;
+   private FT_Face f_bjfvqris;
    /**
     * @mapping {@literal hashed f_lwdmgrzu Lnet/minecraft/unmapped/C_zsraftqh;f_lwdmgrzu:F}
     * @mapping {@literal named oversample Lcom/mojang/blaze3d/font/TrueTypeFont;oversample:F}
@@ -54,19 +53,19 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zsraftqh;<init>(Ljava/nio/ByteBuffer;Lorg/lwjgl/util/freetype/FT_Face;FFFFLjava/lang/String;)V}
     * @mapping {@literal named <init> Lcom/mojang/blaze3d/font/TrueTypeFont;<init>(Ljava/nio/ByteBuffer;Lorg/lwjgl/util/freetype/FT_Face;FFFFLjava/lang/String;)V}
     */
-   public TrueTypeFont(ByteBuffer buffer, FT_Face face, float size, float oversample, float shiftRight, float shiftDown, String excludedCharacters) {
+   public TrueTypeFont(ByteBuffer buffer, FT_Face fT_Face, float f, float oversample, float h, float i, String string) {
       this.buffer = buffer;
-      this.face = face;
+      this.f_bjfvqris = fT_Face;
       this.oversample = oversample;
-      excludedCharacters.codePoints().forEach(this.excludedCharacters::add);
-      int j = Math.round(size * oversample);
-      FreeType.FT_Set_Pixel_Sizes(face, j, j);
-      float k = shiftRight * oversample;
-      float l = -shiftDown * oversample;
+      string.codePoints().forEach(this.excludedCharacters::add);
+      int j = Math.round(f * oversample);
+      FreeType.FT_Set_Pixel_Sizes(fT_Face, j, j);
+      float k = h * oversample;
+      float l = -i * oversample;
 
       try (MemoryStack memoryStack = MemoryStack.stackPush()) {
          FT_Vector fT_Vector = FreeTypeUtil.set(FT_Vector.malloc(memoryStack), k, l);
-         FreeType.FT_Set_Transform(face, null, fT_Vector);
+         FreeType.FT_Set_Transform(fT_Face, null, fT_Vector);
       }
    }
 
@@ -84,7 +83,7 @@
          if (j == 0) {
             return null;
          } else {
-            FreeTypeUtil.checkFreeTypeResult(FreeType.FT_Load_Glyph(fT_Face, j, 4194312), "Loading glyph");
+            FreeTypeUtil.m_tosqipir(FreeType.FT_Load_Glyph(fT_Face, j, 4194312), "Loading glyph");
             FT_GlyphSlot fT_GlyphSlot = (FT_GlyphSlot)Objects.requireNonNull(fT_Face.glyph(), "Glyph not initialized");
             float f = FreeTypeUtil.getX(fT_GlyphSlot.advance());
             FT_Bitmap fT_Bitmap = fT_GlyphSlot.bitmap();
@@ -102,8 +101,8 @@
     * @mapping {@literal named getInfo Lcom/mojang/blaze3d/font/TrueTypeFont;getInfo()Lorg/lwjgl/util/freetype/FT_Face;}
     */
    FT_Face getInfo() {
-      if (this.buffer != null && this.face != null) {
-         return this.face;
+      if (this.buffer != null && this.f_bjfvqris != null) {
+         return this.f_bjfvqris;
       } else {
          throw new IllegalStateException("Provider already closed");
       }
@@ -114,12 +113,12 @@
     */
    @Override
    public void close() {
-      if (this.face != null) {
-         synchronized (FreeTypeUtil.LOCK) {
-            FreeTypeUtil.ensureLoaded(FreeType.FT_Done_Face(this.face), "Deleting face");
+      if (this.f_bjfvqris != null) {
+         synchronized (FreeTypeUtil.f_xliekmlq) {
+            FreeTypeUtil.ensureLoaded(FreeType.FT_Done_Face(this.f_bjfvqris), "Deleting face");
          }
 
-         this.face = null;
+         this.f_bjfvqris = null;
       }
 
       MemoryUtil.memFree(this.buffer);
@@ -187,12 +186,12 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zsraftqh$C_dgweajgp;<init>(Lnet/minecraft/unmapped/C_zsraftqh;FFIIFI)V}
        * @mapping {@literal named <init> Lcom/mojang/blaze3d/font/TrueTypeFont$TtfGlyph;<init>(Lcom/mojang/blaze3d/font/TrueTypeFont;FFIIFI)V}
        */
-      TtfGlyph(final float bearingX, final float ascent, final int width, final int height, final float advance, final int glyphIndex) {
+      TtfGlyph(final float f, final float g, final int width, final int height, final float h, final int glyphIndex) {
          this.width = width;
          this.height = height;
-         this.advance = advance / TrueTypeFont.this.oversample;
-         this.bearingX = bearingX / TrueTypeFont.this.oversample;
-         this.ascent = ascent / TrueTypeFont.this.oversample;
+         this.advance = h / TrueTypeFont.this.oversample;
+         this.bearingX = f / TrueTypeFont.this.oversample;
+         this.ascent = g / TrueTypeFont.this.oversample;
          this.glyphIndex = glyphIndex;
       }
 
@@ -238,7 +237,7 @@
              * Mapping not found
              */
             @Override
-            public float getBearingLeft() {
+            public float m_auvmtwdj() {
                return TtfGlyph.this.bearingX;
             }
 
@@ -246,7 +245,7 @@
              * Mapping not found
              */
             @Override
-            public float getBearingTop() {
+            public float m_pvznkspl() {
                return TtfGlyph.this.ascent;
             }
 
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-07 03:59:24.257182652 +0000
+++ namedSrc/com/mojang/blaze3d/framebuffer/Framebuffer.java	2024-08-07 03:58:15.353046797 +0000
@@ -196,7 +196,7 @@
             );
          }
 
-         this.setFilter(9728, true);
+         this.m_ihnmmvil(9728, true);
          GlStateManager._bindTexture(this.colorAttachment);
          GlStateManager._texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 33071);
          GlStateManager._texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 33071);
@@ -216,24 +216,22 @@
    }
 
    /**
-    * @mapping {@literal hashed m_yitrxoki Lnet/minecraft/unmapped/C_xxwgvelc;m_yitrxoki(I)V}
-    * @mapping {@literal named setFilter Lcom/mojang/blaze3d/framebuffer/Framebuffer;setFilter(I)V}
+    * Mapping not found
     */
-   public void setFilter(int filter) {
-      this.setFilter(filter, false);
+   public void m_yitrxoki(int i) {
+      this.m_ihnmmvil(i, false);
    }
 
    /**
-    * @mapping {@literal hashed m_ihnmmvil Lnet/minecraft/unmapped/C_xxwgvelc;m_ihnmmvil(IZ)V}
-    * @mapping {@literal named setFilter Lcom/mojang/blaze3d/framebuffer/Framebuffer;setFilter(IZ)V}
+    * Mapping not found
     */
-   private void setFilter(int filter, boolean forceApply) {
+   private void m_ihnmmvil(int i, boolean bl) {
       RenderSystem.assertOnRenderThreadOrInit();
-      if (forceApply || filter != this.textureFilter) {
-         this.textureFilter = filter;
+      if (bl || i != this.textureFilter) {
+         this.textureFilter = i;
          GlStateManager._bindTexture(this.colorAttachment);
-         GlStateManager._texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, filter);
-         GlStateManager._texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, filter);
+         GlStateManager._texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, i);
+         GlStateManager._texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, i);
          GlStateManager._bindTexture(0);
       }
    }
@@ -363,12 +361,12 @@
       ShaderProgram lv2 = (ShaderProgram)Objects.requireNonNull(lv.gameRenderer.blitScreenShader, "Blit shader not loaded");
       lv2.addSampler("DiffuseSampler", this.colorAttachment);
       lv2.bind();
-      BufferBuilder lv3 = RenderSystem.renderThreadTessellator().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);
-      lv3.xyz(0.0F, 1.0F, 0.0F);
-      BufferRenderer.draw(lv3.endOrThrow());
+      BufferBuilder lv3 = RenderSystem.renderThreadTessellator().m_zvrvcpdt(VertexFormat.DrawMode.QUADS, VertexFormats.BLIT_SCREEN);
+      lv3.m_yvdedzif(0.0F, 0.0F, 0.0F);
+      lv3.m_yvdedzif(1.0F, 0.0F, 0.0F);
+      lv3.m_yvdedzif(1.0F, 1.0F, 0.0F);
+      lv3.m_yvdedzif(0.0F, 1.0F, 0.0F);
+      BufferRenderer.draw(lv3.m_nnuyibos());
       lv2.unbind();
       GlStateManager._depthMask(true);
       GlStateManager._colorMask(true, true, true, true);
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-07 03:59:24.309182754 +0000
+++ namedSrc/com/mojang/blaze3d/platform/GLX.java	2024-08-07 03:58:15.425046941 +0000
@@ -161,42 +161,42 @@
          GlStateManager._disableCull();
          RenderSystem.setShader(GameRenderer::getRenderTypeLinesShader);
          Tessellator lv = RenderSystem.renderThreadTessellator();
-         BufferBuilder lv2 = lv.begin(VertexFormat.DrawMode.LINES, VertexFormats.LINES);
+         BufferBuilder lv2 = lv.m_zvrvcpdt(VertexFormat.DrawMode.LINES, VertexFormats.LINES);
          RenderSystem.lineWidth(4.0F);
          if (drawX) {
-            lv2.xyz(0.0F, 0.0F, 0.0F).color(-16777216).normal(1.0F, 0.0F, 0.0F);
-            lv2.xyz((float)size, 0.0F, 0.0F).color(-16777216).normal(1.0F, 0.0F, 0.0F);
+            lv2.m_yvdedzif(0.0F, 0.0F, 0.0F).m_ppknjxpl(-16777216).m_nlxhvdzj(1.0F, 0.0F, 0.0F);
+            lv2.m_yvdedzif((float)size, 0.0F, 0.0F).m_ppknjxpl(-16777216).m_nlxhvdzj(1.0F, 0.0F, 0.0F);
          }
 
          if (drawY) {
-            lv2.xyz(0.0F, 0.0F, 0.0F).color(-16777216).normal(0.0F, 1.0F, 0.0F);
-            lv2.xyz(0.0F, (float)size, 0.0F).color(-16777216).normal(0.0F, 1.0F, 0.0F);
+            lv2.m_yvdedzif(0.0F, 0.0F, 0.0F).m_ppknjxpl(-16777216).m_nlxhvdzj(0.0F, 1.0F, 0.0F);
+            lv2.m_yvdedzif(0.0F, (float)size, 0.0F).m_ppknjxpl(-16777216).m_nlxhvdzj(0.0F, 1.0F, 0.0F);
          }
 
          if (drawZ) {
-            lv2.xyz(0.0F, 0.0F, 0.0F).color(-16777216).normal(0.0F, 0.0F, 1.0F);
-            lv2.xyz(0.0F, 0.0F, (float)size).color(-16777216).normal(0.0F, 0.0F, 1.0F);
+            lv2.m_yvdedzif(0.0F, 0.0F, 0.0F).m_ppknjxpl(-16777216).m_nlxhvdzj(0.0F, 0.0F, 1.0F);
+            lv2.m_yvdedzif(0.0F, 0.0F, (float)size).m_ppknjxpl(-16777216).m_nlxhvdzj(0.0F, 0.0F, 1.0F);
          }
 
-         BufferRenderer.drawWithShader(lv2.endOrThrow());
+         BufferRenderer.drawWithShader(lv2.m_nnuyibos());
          RenderSystem.lineWidth(2.0F);
-         lv2 = lv.begin(VertexFormat.DrawMode.LINES, VertexFormats.LINES);
+         lv2 = lv.m_zvrvcpdt(VertexFormat.DrawMode.LINES, VertexFormats.LINES);
          if (drawX) {
-            lv2.xyz(0.0F, 0.0F, 0.0F).color(-65536).normal(1.0F, 0.0F, 0.0F);
-            lv2.xyz((float)size, 0.0F, 0.0F).color(-65536).normal(1.0F, 0.0F, 0.0F);
+            lv2.m_yvdedzif(0.0F, 0.0F, 0.0F).m_ppknjxpl(-65536).m_nlxhvdzj(1.0F, 0.0F, 0.0F);
+            lv2.m_yvdedzif((float)size, 0.0F, 0.0F).m_ppknjxpl(-65536).m_nlxhvdzj(1.0F, 0.0F, 0.0F);
          }
 
          if (drawY) {
-            lv2.xyz(0.0F, 0.0F, 0.0F).color(-16711936).normal(0.0F, 1.0F, 0.0F);
-            lv2.xyz(0.0F, (float)size, 0.0F).color(-16711936).normal(0.0F, 1.0F, 0.0F);
+            lv2.m_yvdedzif(0.0F, 0.0F, 0.0F).m_ppknjxpl(-16711936).m_nlxhvdzj(0.0F, 1.0F, 0.0F);
+            lv2.m_yvdedzif(0.0F, (float)size, 0.0F).m_ppknjxpl(-16711936).m_nlxhvdzj(0.0F, 1.0F, 0.0F);
          }
 
          if (drawZ) {
-            lv2.xyz(0.0F, 0.0F, 0.0F).color(-8421377).normal(0.0F, 0.0F, 1.0F);
-            lv2.xyz(0.0F, 0.0F, (float)size).color(-8421377).normal(0.0F, 0.0F, 1.0F);
+            lv2.m_yvdedzif(0.0F, 0.0F, 0.0F).m_ppknjxpl(-8421377).m_nlxhvdzj(0.0F, 0.0F, 1.0F);
+            lv2.m_yvdedzif(0.0F, 0.0F, (float)size).m_ppknjxpl(-8421377).m_nlxhvdzj(0.0F, 0.0F, 1.0F);
          }
 
-         BufferRenderer.drawWithShader(lv2.endOrThrow());
+         BufferRenderer.drawWithShader(lv2.m_nnuyibos());
          RenderSystem.lineWidth(1.0F);
          GlStateManager._enableCull();
          GlStateManager._depthMask(true);
diff -bur namedTargetSrc/com/mojang/blaze3d/shader/GlUniform.java namedSrc/com/mojang/blaze3d/shader/GlUniform.java
--- namedTargetSrc/com/mojang/blaze3d/shader/GlUniform.java	2024-08-07 03:59:24.089182321 +0000
+++ namedSrc/com/mojang/blaze3d/shader/GlUniform.java	2024-08-07 03:58:15.145046382 +0000
@@ -180,8 +180,7 @@
    }
 
    /**
-    * @mapping {@literal hashed close Lnet/minecraft/unmapped/C_guotmxqh;close()V}
-    * @mapping {@literal named close Lcom/mojang/blaze3d/shader/GlUniform;close()V}
+    * Mapping not found
     */
    public void close() {
       if (this.intData != null) {
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-07 03:59:24.321182778 +0000
+++ namedSrc/com/mojang/blaze3d/systems/RenderSystem.java	2024-08-07 03:58:15.453046997 +0000
@@ -139,10 +139,9 @@
     */
    private static VertexSorting savedVertexSorting = VertexSorting.DISTANCE_TO_ORIGIN;
    /**
-    * @mapping {@literal hashed modelViewStack Lcom/mojang/blaze3d/systems/RenderSystem;modelViewStack:Lorg/joml/Matrix4fStack;}
-    * @mapping {@literal named MODEL_VIEW_STACK Lcom/mojang/blaze3d/systems/RenderSystem;MODEL_VIEW_STACK:Lorg/joml/Matrix4fStack;}
+    * Mapping not found
     */
-   private static final Matrix4fStack MODEL_VIEW_STACK = new Matrix4fStack(16);
+   private static final Matrix4fStack modelViewStack = new Matrix4fStack(16);
    /**
     * @mapping {@literal hashed modelViewMatrix Lcom/mojang/blaze3d/systems/RenderSystem;modelViewMatrix:Lorg/joml/Matrix4f;}
     * @mapping {@literal named modelViewMatrix Lcom/mojang/blaze3d/systems/RenderSystem;modelViewMatrix:Lorg/joml/Matrix4f;}
@@ -315,7 +314,7 @@
    public static void flipFrame(long window) {
       pollEvents();
       replayQueue();
-      Tessellator.getInstance().clear();
+      Tessellator.getInstance().m_qmxalmqa();
       GLFW.glfwSwapBuffers(window);
       pollEvents();
    }
@@ -1138,7 +1137,7 @@
     * @mapping {@literal hashed setupOverlayColor Lcom/mojang/blaze3d/systems/RenderSystem;setupOverlayColor(II)V}
     * @mapping {@literal named setupOverlayColor Lcom/mojang/blaze3d/systems/RenderSystem;setupOverlayColor(II)V}
     */
-   public static void setupOverlayColor(int textureId, int color) {
+   public static void setupOverlayColor(int textureId, int j) {
       assertOnRenderThread();
       setShaderTexture(1, textureId);
    }
@@ -1387,7 +1386,7 @@
     * @mapping {@literal named applyModelViewMatrix Lcom/mojang/blaze3d/systems/RenderSystem;applyModelViewMatrix()V}
     */
    public static void applyModelViewMatrix() {
-      Matrix4f matrix4f = new Matrix4f(MODEL_VIEW_STACK);
+      Matrix4f matrix4f = new Matrix4f(modelViewStack);
       if (!isOnRenderThread()) {
          recordRenderCall(() -> modelViewMatrix = matrix4f);
       } else {
@@ -1456,11 +1455,10 @@
    }
 
    /**
-    * @mapping {@literal hashed getModelViewStack Lcom/mojang/blaze3d/systems/RenderSystem;getModelViewStack()Lorg/joml/Matrix4fStack;}
-    * @mapping {@literal named getModelViewStack Lcom/mojang/blaze3d/systems/RenderSystem;getModelViewStack()Lorg/joml/Matrix4fStack;}
+    * Mapping not found
     */
    public static Matrix4fStack getModelViewStack() {
-      return MODEL_VIEW_STACK;
+      return modelViewStack;
    }
 
    /**
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/BufferBuilder.java namedSrc/com/mojang/blaze3d/vertex/BufferBuilder.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/BufferBuilder.java	2024-08-07 03:59:24.385182904 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/BufferBuilder.java	2024-08-07 03:58:15.545047181 +0000
@@ -5,6 +5,8 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.util.ColorUtil;
+import net.minecraft.unmapped.C_fpcijbbg;
+import net.minecraft.unmapped.C_wcwbedxs;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.system.MemoryUtil;
@@ -16,30 +18,26 @@
 @Environment(EnvType.CLIENT)
 public class BufferBuilder implements VertexConsumer {
    /**
-    * @mapping {@literal hashed f_gyaaueqa Lnet/minecraft/unmapped/C_nxnqmnng;f_gyaaueqa:J}
-    * @mapping {@literal named NOT_BUILDING Lcom/mojang/blaze3d/vertex/BufferBuilder;NOT_BUILDING:J}
+    * Mapping not found
     */
-   private static final long NOT_BUILDING = -1L;
+   private static final long f_gyaaueqa = -1L;
    /**
-    * @mapping {@literal hashed f_eobosjlb Lnet/minecraft/unmapped/C_nxnqmnng;f_eobosjlb:J}
-    * @mapping {@literal named UNKNOWN_ELEMENT Lcom/mojang/blaze3d/vertex/BufferBuilder;UNKNOWN_ELEMENT:J}
+    * Mapping not found
     */
-   private static final long UNKNOWN_ELEMENT = -1L;
+   private static final long f_eobosjlb = -1L;
    /**
-    * @mapping {@literal hashed f_qnmtwykl Lnet/minecraft/unmapped/C_nxnqmnng;f_qnmtwykl:Z}
-    * @mapping {@literal named LITTLE_ENDIAN Lcom/mojang/blaze3d/vertex/BufferBuilder;LITTLE_ENDIAN:Z}
+    * Mapping not found
     */
-   private static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
+   private static final boolean f_qnmtwykl = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
    /**
     * @mapping {@literal hashed f_xkduvski Lnet/minecraft/unmapped/C_nxnqmnng;f_xkduvski:Lnet/minecraft/unmapped/C_wcwbedxs;}
-    * @mapping {@literal named buffer Lcom/mojang/blaze3d/vertex/BufferBuilder;buffer:Lcom/mojang/blaze3d/vertex/Buffer;}
+    * @mapping {@literal named buffer Lcom/mojang/blaze3d/vertex/BufferBuilder;buffer:Lnet/minecraft/unmapped/C_wcwbedxs;}
     */
-   private final Buffer buffer;
+   private final C_wcwbedxs buffer;
    /**
-    * @mapping {@literal hashed f_bddfwywi Lnet/minecraft/unmapped/C_nxnqmnng;f_bddfwywi:J}
-    * @mapping {@literal named pointer Lcom/mojang/blaze3d/vertex/BufferBuilder;pointer:J}
+    * Mapping not found
     */
-   private long pointer = -1L;
+   private long f_bddfwywi = -1L;
    /**
     * @mapping {@literal hashed f_ltvrvvts Lnet/minecraft/unmapped/C_nxnqmnng;f_ltvrvvts:I}
     * @mapping {@literal named vertexCount Lcom/mojang/blaze3d/vertex/BufferBuilder;vertexCount:I}
@@ -66,25 +64,21 @@
     */
    private final boolean hasOverlay;
    /**
-    * @mapping {@literal hashed f_seyliexk Lnet/minecraft/unmapped/C_nxnqmnng;f_seyliexk:I}
-    * @mapping {@literal named stride Lcom/mojang/blaze3d/vertex/BufferBuilder;stride:I}
+    * Mapping not found
     */
-   private final int stride;
+   private final int f_seyliexk;
    /**
-    * @mapping {@literal hashed f_zptoheux Lnet/minecraft/unmapped/C_nxnqmnng;f_zptoheux:I}
-    * @mapping {@literal named nonPositionMask Lcom/mojang/blaze3d/vertex/BufferBuilder;nonPositionMask:I}
+    * Mapping not found
     */
-   private final int nonPositionMask;
+   private final int f_zptoheux;
    /**
-    * @mapping {@literal hashed f_xokepvuu Lnet/minecraft/unmapped/C_nxnqmnng;f_xokepvuu:[I}
-    * @mapping {@literal named attributeIndices Lcom/mojang/blaze3d/vertex/BufferBuilder;attributeIndices:[I}
+    * Mapping not found
     */
-   private final int[] attributeIndices;
+   private final int[] f_xokepvuu;
    /**
-    * @mapping {@literal hashed f_uojbwxik Lnet/minecraft/unmapped/C_nxnqmnng;f_uojbwxik:I}
-    * @mapping {@literal named remainingMask Lcom/mojang/blaze3d/vertex/BufferBuilder;remainingMask:I}
+    * Mapping not found
     */
-   private int remainingMask;
+   private int f_uojbwxik;
    /**
     * @mapping {@literal hashed f_wyaejrdq Lnet/minecraft/unmapped/C_nxnqmnng;f_wyaejrdq:Z}
     * @mapping {@literal named building Lcom/mojang/blaze3d/vertex/BufferBuilder;building:Z}
@@ -93,18 +87,18 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nxnqmnng;<init>(Lnet/minecraft/unmapped/C_wcwbedxs;Lnet/minecraft/unmapped/C_rnldvdpe$C_ptsbsfse;Lnet/minecraft/unmapped/C_rnldvdpe;)V}
-    * @mapping {@literal named <init> Lcom/mojang/blaze3d/vertex/BufferBuilder;<init>(Lcom/mojang/blaze3d/vertex/Buffer;Lcom/mojang/blaze3d/vertex/VertexFormat$DrawMode;Lcom/mojang/blaze3d/vertex/VertexFormat;)V}
+    * @mapping {@literal named <init> Lcom/mojang/blaze3d/vertex/BufferBuilder;<init>(Lnet/minecraft/unmapped/C_wcwbedxs;Lcom/mojang/blaze3d/vertex/VertexFormat$DrawMode;Lcom/mojang/blaze3d/vertex/VertexFormat;)V}
     */
-   public BufferBuilder(Buffer buffer, VertexFormat.DrawMode drawMode, VertexFormat format) {
-      if (!format.contains(VertexFormatElement.POSITION)) {
+   public BufferBuilder(C_wcwbedxs buffer, VertexFormat.DrawMode drawMode, VertexFormat format) {
+      if (!format.m_itfposxz(VertexFormatElement.f_ikjjihsm)) {
          throw new IllegalArgumentException("Cannot build mesh with no position element");
       } else {
          this.buffer = buffer;
          this.drawMode = drawMode;
          this.format = format;
-         this.stride = format.getVertexSize();
-         this.nonPositionMask = format.getMask() & ~VertexFormatElement.POSITION.mask();
-         this.attributeIndices = format.getAttributeIndices();
+         this.f_seyliexk = format.getVertexSize();
+         this.f_zptoheux = format.m_xxfnxtpe() & ~VertexFormatElement.f_ikjjihsm.m_iqqimcab();
+         this.f_xokepvuu = format.m_zildndhz();
          boolean bl = format == VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL;
          boolean bl2 = format == VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL;
          this.textured = bl || bl2;
@@ -113,25 +107,23 @@
    }
 
    /**
-    * @mapping {@literal hashed m_getnreuz Lnet/minecraft/unmapped/C_nxnqmnng;m_getnreuz()Lnet/minecraft/unmapped/C_fpcijbbg;}
-    * @mapping {@literal named end Lcom/mojang/blaze3d/vertex/BufferBuilder;end()Lcom/mojang/blaze3d/vertex/BuiltBuffer;}
+    * Mapping not found
     */
    @Nullable
-   public BuiltBuffer end() {
-      this.assertBuilding();
-      this.endLastVertex();
-      BuiltBuffer lv = this.build();
+   public C_fpcijbbg m_getnreuz() {
+      this.m_klggtpay();
+      this.m_hdnzyayv();
+      C_fpcijbbg lv = this.m_tbeybmch();
       this.building = false;
-      this.pointer = -1L;
+      this.f_bddfwywi = -1L;
       return lv;
    }
 
    /**
-    * @mapping {@literal hashed m_nnuyibos Lnet/minecraft/unmapped/C_nxnqmnng;m_nnuyibos()Lnet/minecraft/unmapped/C_fpcijbbg;}
-    * @mapping {@literal named endOrThrow Lcom/mojang/blaze3d/vertex/BufferBuilder;endOrThrow()Lcom/mojang/blaze3d/vertex/BuiltBuffer;}
+    * Mapping not found
     */
-   public BuiltBuffer endOrThrow() {
-      BuiltBuffer lv = this.end();
+   public C_fpcijbbg m_nnuyibos() {
+      C_fpcijbbg lv = this.m_getnreuz();
       if (lv == null) {
          throw new IllegalStateException("BufferBuilder was empty");
       } else {
@@ -140,81 +132,76 @@
    }
 
    /**
-    * @mapping {@literal hashed m_klggtpay Lnet/minecraft/unmapped/C_nxnqmnng;m_klggtpay()V}
-    * @mapping {@literal named assertBuilding Lcom/mojang/blaze3d/vertex/BufferBuilder;assertBuilding()V}
+    * Mapping not found
     */
-   private void assertBuilding() {
+   private void m_klggtpay() {
       if (!this.building) {
          throw new IllegalStateException("Not building!");
       }
    }
 
    /**
-    * @mapping {@literal hashed m_tbeybmch Lnet/minecraft/unmapped/C_nxnqmnng;m_tbeybmch()Lnet/minecraft/unmapped/C_fpcijbbg;}
-    * @mapping {@literal named build Lcom/mojang/blaze3d/vertex/BufferBuilder;build()Lcom/mojang/blaze3d/vertex/BuiltBuffer;}
+    * Mapping not found
     */
    @Nullable
-   private BuiltBuffer build() {
+   private C_fpcijbbg m_tbeybmch() {
       if (this.vertexCount == 0) {
          return null;
       } else {
-         Buffer.View lv = this.buffer.getView();
+         C_wcwbedxs.C_thqtmwcx lv = this.buffer.m_gkikmidu();
          if (lv == null) {
             return null;
          } else {
             int i = this.drawMode.indexCount(this.vertexCount);
             VertexFormat.IndexType lv2 = VertexFormat.IndexType.getSmallestIndexType(this.vertexCount);
-            return new BuiltBuffer(lv, new BuiltBuffer.DrawParameters(this.format, this.vertexCount, i, this.drawMode, lv2));
+            return new C_fpcijbbg(lv, new C_fpcijbbg.C_nrbitmxm(this.format, this.vertexCount, i, this.drawMode, lv2));
          }
       }
    }
 
    /**
-    * @mapping {@literal hashed m_drrnipkp Lnet/minecraft/unmapped/C_nxnqmnng;m_drrnipkp()J}
-    * @mapping {@literal named beginVertex Lcom/mojang/blaze3d/vertex/BufferBuilder;beginVertex()J}
+    * Mapping not found
     */
-   private long beginVertex() {
-      this.assertBuilding();
-      this.endLastVertex();
+   private long m_drrnipkp() {
+      this.m_klggtpay();
+      this.m_hdnzyayv();
       this.vertexCount++;
-      long l = this.buffer.reserve(this.stride);
-      this.pointer = l;
+      long l = this.buffer.m_ewtigikr(this.f_seyliexk);
+      this.f_bddfwywi = l;
       return l;
    }
 
    /**
-    * @mapping {@literal hashed m_bhrlaogi Lnet/minecraft/unmapped/C_nxnqmnng;m_bhrlaogi(Lnet/minecraft/unmapped/C_gmhefnuu;)J}
-    * @mapping {@literal named markUsed Lcom/mojang/blaze3d/vertex/BufferBuilder;markUsed(Lcom/mojang/blaze3d/vertex/VertexFormatElement;)J}
+    * Mapping not found
     */
-   private long markUsed(VertexFormatElement element) {
-      int i = this.remainingMask;
-      int j = i & ~element.mask();
+   private long m_bhrlaogi(VertexFormatElement arg) {
+      int i = this.f_uojbwxik;
+      int j = i & ~arg.m_iqqimcab();
       if (j == i) {
          return -1L;
       } else {
-         this.remainingMask = j;
-         long l = this.pointer;
+         this.f_uojbwxik = j;
+         long l = this.f_bddfwywi;
          if (l == -1L) {
             throw new IllegalArgumentException("Not currently building vertex");
          } else {
-            return l + (long)this.attributeIndices[element.id()];
+            return l + (long)this.f_xokepvuu[arg.id()];
          }
       }
    }
 
    /**
-    * @mapping {@literal hashed m_hdnzyayv Lnet/minecraft/unmapped/C_nxnqmnng;m_hdnzyayv()V}
-    * @mapping {@literal named endLastVertex Lcom/mojang/blaze3d/vertex/BufferBuilder;endLastVertex()V}
+    * Mapping not found
     */
-   private void endLastVertex() {
+   private void m_hdnzyayv() {
       if (this.vertexCount != 0) {
-         if (this.remainingMask != 0) {
-            String string = (String)VertexFormatElement.stream(this.remainingMask).map(this.format::getAttributeName).collect(Collectors.joining(", "));
+         if (this.f_uojbwxik != 0) {
+            String string = (String)VertexFormatElement.m_cjrjryfl(this.f_uojbwxik).map(this.format::m_fyghzmni).collect(Collectors.joining(", "));
             throw new IllegalStateException("Missing elements in vertex: " + string);
          } else {
             if (this.drawMode == VertexFormat.DrawMode.LINES || this.drawMode == VertexFormat.DrawMode.LINE_STRIP) {
-               long l = this.buffer.reserve(this.stride);
-               MemoryUtil.memCopy(l - (long)this.stride, l, (long)this.stride);
+               long l = this.buffer.m_ewtigikr(this.f_seyliexk);
+               MemoryUtil.memCopy(l - (long)this.f_seyliexk, l, (long)this.f_seyliexk);
                this.vertexCount++;
             }
          }
@@ -222,24 +209,22 @@
    }
 
    /**
-    * @mapping {@literal hashed m_oeankjiv Lnet/minecraft/unmapped/C_nxnqmnng;m_oeankjiv(JI)V}
-    * @mapping {@literal named putColor Lcom/mojang/blaze3d/vertex/BufferBuilder;putColor(JI)V}
+    * Mapping not found
     */
-   private static void putColor(long position, int color) {
-      int j = ColorUtil.Abgr32.toAbgr(color);
-      MemoryUtil.memPutInt(position, LITTLE_ENDIAN ? j : Integer.reverseBytes(j));
+   private static void m_oeankjiv(long l, int i) {
+      int j = ColorUtil.Abgr32.m_nigcdqgn(i);
+      MemoryUtil.memPutInt(l, f_qnmtwykl ? j : Integer.reverseBytes(j));
    }
 
    /**
-    * @mapping {@literal hashed m_zrflpijc Lnet/minecraft/unmapped/C_nxnqmnng;m_zrflpijc(JI)V}
-    * @mapping {@literal named putIntAsShort Lcom/mojang/blaze3d/vertex/BufferBuilder;putIntAsShort(JI)V}
+    * Mapping not found
     */
-   private static void putIntAsShort(long position, int i) {
-      if (LITTLE_ENDIAN) {
-         MemoryUtil.memPutInt(position, i);
+   private static void m_zrflpijc(long l, int i) {
+      if (f_qnmtwykl) {
+         MemoryUtil.memPutInt(l, i);
       } else {
-         MemoryUtil.memPutShort(position, (short)(i & 65535));
-         MemoryUtil.memPutShort(position + 2L, (short)(i >> 16 & 65535));
+         MemoryUtil.memPutShort(l, (short)(i & 65535));
+         MemoryUtil.memPutShort(l + 2L, (short)(i >> 16 & 65535));
       }
    }
 
@@ -247,12 +232,12 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer xyz(float x, float y, float z) {
-      long l = this.beginVertex() + (long)this.attributeIndices[VertexFormatElement.POSITION.id()];
-      this.remainingMask = this.nonPositionMask;
-      MemoryUtil.memPutFloat(l, x);
-      MemoryUtil.memPutFloat(l + 4L, y);
-      MemoryUtil.memPutFloat(l + 8L, z);
+   public VertexConsumer m_yvdedzif(float f, float g, float h) {
+      long l = this.m_drrnipkp() + (long)this.f_xokepvuu[VertexFormatElement.f_ikjjihsm.id()];
+      this.f_uojbwxik = this.f_zptoheux;
+      MemoryUtil.memPutFloat(l, f);
+      MemoryUtil.memPutFloat(l + 4L, g);
+      MemoryUtil.memPutFloat(l + 8L, h);
       return this;
    }
 
@@ -260,13 +245,13 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer color(int r, int g, int b, int a) {
-      long m = this.markUsed(VertexFormatElement.COLOR);
+   public VertexConsumer m_wnzjlyty(int i, int j, int k, int l) {
+      long m = this.m_bhrlaogi(VertexFormatElement.UBYTE);
       if (m != -1L) {
-         MemoryUtil.memPutByte(m, (byte)r);
-         MemoryUtil.memPutByte(m + 1L, (byte)g);
-         MemoryUtil.memPutByte(m + 2L, (byte)b);
-         MemoryUtil.memPutByte(m + 3L, (byte)a);
+         MemoryUtil.memPutByte(m, (byte)i);
+         MemoryUtil.memPutByte(m + 1L, (byte)j);
+         MemoryUtil.memPutByte(m + 2L, (byte)k);
+         MemoryUtil.memPutByte(m + 3L, (byte)l);
       }
 
       return this;
@@ -276,10 +261,10 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer color(int argb) {
-      long l = this.markUsed(VertexFormatElement.COLOR);
+   public VertexConsumer m_ppknjxpl(int i) {
+      long l = this.m_bhrlaogi(VertexFormatElement.UBYTE);
       if (l != -1L) {
-         putColor(l, argb);
+         m_oeankjiv(l, i);
       }
 
       return this;
@@ -289,11 +274,11 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer uv0(float u, float v) {
-      long l = this.markUsed(VertexFormatElement.UV0);
+   public VertexConsumer m_dtuhivbh(float f, float g) {
+      long l = this.m_bhrlaogi(VertexFormatElement.FLOAT);
       if (l != -1L) {
-         MemoryUtil.memPutFloat(l, u);
-         MemoryUtil.memPutFloat(l + 4L, v);
+         MemoryUtil.memPutFloat(l, f);
+         MemoryUtil.memPutFloat(l + 4L, g);
       }
 
       return this;
@@ -303,18 +288,18 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer uv1(int u, int v) {
-      return this.uv((short)u, (short)v, VertexFormatElement.UV1);
+   public VertexConsumer m_dbgftfke(int i, int j) {
+      return this.m_hklmjhnl((short)i, (short)j, VertexFormatElement.f_zggaqqby);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public VertexConsumer uv1(int uv) {
-      long l = this.markUsed(VertexFormatElement.UV1);
+   public VertexConsumer m_sjawvctb(int i) {
+      long l = this.m_bhrlaogi(VertexFormatElement.f_zggaqqby);
       if (l != -1L) {
-         putIntAsShort(l, uv);
+         m_zrflpijc(l, i);
       }
 
       return this;
@@ -324,32 +309,31 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer uv2(int u, int v) {
-      return this.uv((short)u, (short)v, VertexFormatElement.UV2);
+   public VertexConsumer m_xhzhhqoo(int i, int j) {
+      return this.m_hklmjhnl((short)i, (short)j, VertexFormatElement.SHORT);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public VertexConsumer uv2(int uv) {
-      long l = this.markUsed(VertexFormatElement.UV2);
+   public VertexConsumer m_gvxlcabh(int i) {
+      long l = this.m_bhrlaogi(VertexFormatElement.SHORT);
       if (l != -1L) {
-         putIntAsShort(l, uv);
+         m_zrflpijc(l, i);
       }
 
       return this;
    }
 
    /**
-    * @mapping {@literal hashed m_hklmjhnl Lnet/minecraft/unmapped/C_nxnqmnng;m_hklmjhnl(SSLnet/minecraft/unmapped/C_gmhefnuu;)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named uv Lcom/mojang/blaze3d/vertex/BufferBuilder;uv(SSLcom/mojang/blaze3d/vertex/VertexFormatElement;)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   private VertexConsumer uv(short u, short v, VertexFormatElement element) {
-      long l = this.markUsed(element);
+   private VertexConsumer m_hklmjhnl(short s, short t, VertexFormatElement arg) {
+      long l = this.m_bhrlaogi(arg);
       if (l != -1L) {
-         MemoryUtil.memPutShort(l, u);
-         MemoryUtil.memPutShort(l + 2L, v);
+         MemoryUtil.memPutShort(l, s);
+         MemoryUtil.memPutShort(l + 2L, t);
       }
 
       return this;
@@ -359,12 +343,12 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer normal(float normalX, float normalY, float normalZ) {
-      long l = this.markUsed(VertexFormatElement.NORMAL);
+   public VertexConsumer m_nlxhvdzj(float f, float g, float h) {
+      long l = this.m_bhrlaogi(VertexFormatElement.BYTE);
       if (l != -1L) {
-         MemoryUtil.memPutByte(l, clamp(normalX));
-         MemoryUtil.memPutByte(l + 1L, clamp(normalY));
-         MemoryUtil.memPutByte(l + 2L, clamp(normalZ));
+         MemoryUtil.memPutByte(l, m_yedmtigm(f));
+         MemoryUtil.memPutByte(l + 1L, m_yedmtigm(g));
+         MemoryUtil.memPutByte(l + 2L, m_yedmtigm(h));
       }
 
       return this;
@@ -372,39 +356,39 @@
 
    /**
     * @mapping {@literal hashed m_yedmtigm Lnet/minecraft/unmapped/C_nxnqmnng;m_yedmtigm(F)B}
-    * @mapping {@literal named clamp Lcom/mojang/blaze3d/vertex/BufferBuilder;clamp(F)B}
+    * @mapping {@literal named m_yedmtigm Lcom/mojang/blaze3d/vertex/BufferBuilder;m_yedmtigm(F)B}
     */
-   private static byte clamp(float normal) {
-      return (byte)((int)(MathHelper.clamp(normal, -1.0F, 1.0F) * 127.0F) & 0xFF);
+   private static byte m_yedmtigm(float a) {
+      return (byte)((int)(MathHelper.clamp(a, -1.0F, 1.0F) * 127.0F) & 0xFF);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void addVertex(float x, float y, float z, int argb, float u, float v, int uv1, int uv2, float normalX, float normalY, float normalZ) {
+   public void m_dchtfeel(float f, float g, float h, int i, float j, float k, int l, int m, float n, float o, float p) {
       if (this.textured) {
-         long q = this.beginVertex();
-         MemoryUtil.memPutFloat(q + 0L, x);
-         MemoryUtil.memPutFloat(q + 4L, y);
-         MemoryUtil.memPutFloat(q + 8L, z);
-         putColor(q + 12L, argb);
-         MemoryUtil.memPutFloat(q + 16L, u);
-         MemoryUtil.memPutFloat(q + 20L, v);
+         long q = this.m_drrnipkp();
+         MemoryUtil.memPutFloat(q + 0L, f);
+         MemoryUtil.memPutFloat(q + 4L, g);
+         MemoryUtil.memPutFloat(q + 8L, h);
+         m_oeankjiv(q + 12L, i);
+         MemoryUtil.memPutFloat(q + 16L, j);
+         MemoryUtil.memPutFloat(q + 20L, k);
          long r;
          if (this.hasOverlay) {
-            putIntAsShort(q + 24L, uv1);
+            m_zrflpijc(q + 24L, l);
             r = q + 28L;
          } else {
             r = q + 24L;
          }
 
-         putIntAsShort(r + 0L, uv2);
-         MemoryUtil.memPutByte(r + 4L, clamp(normalX));
-         MemoryUtil.memPutByte(r + 5L, clamp(normalY));
-         MemoryUtil.memPutByte(r + 6L, clamp(normalZ));
+         m_zrflpijc(r + 0L, m);
+         MemoryUtil.memPutByte(r + 4L, m_yedmtigm(n));
+         MemoryUtil.memPutByte(r + 5L, m_yedmtigm(o));
+         MemoryUtil.memPutByte(r + 6L, m_yedmtigm(p));
       } else {
-         VertexConsumer.super.addVertex(x, y, z, argb, u, v, uv1, uv2, normalX, normalY, normalZ);
+         VertexConsumer.super.m_dchtfeel(f, g, h, i, j, k, l, m, n, o, p);
       }
    }
 }
Only in namedTargetSrc/com/mojang/blaze3d/vertex: Buffer.java
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/BufferRenderer.java namedSrc/com/mojang/blaze3d/vertex/BufferRenderer.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/BufferRenderer.java	2024-08-07 03:59:24.337182810 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/BufferRenderer.java	2024-08-07 03:58:15.469047029 +0000
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.unmapped.C_fpcijbbg;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -39,42 +40,42 @@
 
    /**
     * @mapping {@literal hashed m_gkzkvnis Lnet/minecraft/unmapped/C_erlzmion;m_gkzkvnis(Lnet/minecraft/unmapped/C_fpcijbbg;)V}
-    * @mapping {@literal named drawWithShader Lcom/mojang/blaze3d/vertex/BufferRenderer;drawWithShader(Lcom/mojang/blaze3d/vertex/BuiltBuffer;)V}
+    * @mapping {@literal named drawWithShader Lcom/mojang/blaze3d/vertex/BufferRenderer;drawWithShader(Lnet/minecraft/unmapped/C_fpcijbbg;)V}
     */
-   public static void drawWithShader(BuiltBuffer buffer) {
+   public static void drawWithShader(C_fpcijbbg arg) {
       if (!RenderSystem.isOnRenderThreadOrInit()) {
-         RenderSystem.recordRenderCall(() -> _drawWithShader(buffer));
+         RenderSystem.recordRenderCall(() -> _drawWithShader(arg));
       } else {
-         _drawWithShader(buffer);
+         _drawWithShader(arg);
       }
    }
 
    /**
     * @mapping {@literal hashed m_wpivoiru Lnet/minecraft/unmapped/C_erlzmion;m_wpivoiru(Lnet/minecraft/unmapped/C_fpcijbbg;)V}
-    * @mapping {@literal named _drawWithShader Lcom/mojang/blaze3d/vertex/BufferRenderer;_drawWithShader(Lcom/mojang/blaze3d/vertex/BuiltBuffer;)V}
+    * @mapping {@literal named _drawWithShader Lcom/mojang/blaze3d/vertex/BufferRenderer;_drawWithShader(Lnet/minecraft/unmapped/C_fpcijbbg;)V}
     */
-   private static void _drawWithShader(BuiltBuffer buffer) {
-      VertexBuffer lv = upload(buffer);
+   private static void _drawWithShader(C_fpcijbbg arg) {
+      VertexBuffer lv = upload(arg);
       lv.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
    }
 
    /**
     * @mapping {@literal hashed m_sdgdcmcc Lnet/minecraft/unmapped/C_erlzmion;m_sdgdcmcc(Lnet/minecraft/unmapped/C_fpcijbbg;)V}
-    * @mapping {@literal named draw Lcom/mojang/blaze3d/vertex/BufferRenderer;draw(Lcom/mojang/blaze3d/vertex/BuiltBuffer;)V}
+    * @mapping {@literal named draw Lcom/mojang/blaze3d/vertex/BufferRenderer;draw(Lnet/minecraft/unmapped/C_fpcijbbg;)V}
     */
-   public static void draw(BuiltBuffer buffer) {
-      VertexBuffer lv = upload(buffer);
+   public static void draw(C_fpcijbbg arg) {
+      VertexBuffer lv = upload(arg);
       lv.drawElements();
    }
 
    /**
     * @mapping {@literal hashed m_ixhvbexw Lnet/minecraft/unmapped/C_erlzmion;m_ixhvbexw(Lnet/minecraft/unmapped/C_fpcijbbg;)Lnet/minecraft/unmapped/C_lhjdxjis;}
-    * @mapping {@literal named upload Lcom/mojang/blaze3d/vertex/BufferRenderer;upload(Lcom/mojang/blaze3d/vertex/BuiltBuffer;)Lcom/mojang/blaze3d/vertex/VertexBuffer;}
+    * @mapping {@literal named upload Lcom/mojang/blaze3d/vertex/BufferRenderer;upload(Lnet/minecraft/unmapped/C_fpcijbbg;)Lcom/mojang/blaze3d/vertex/VertexBuffer;}
     */
-   private static VertexBuffer upload(BuiltBuffer buffer) {
+   private static VertexBuffer upload(C_fpcijbbg arg) {
       RenderSystem.assertOnRenderThread();
-      VertexBuffer lv = getAndBindBuffer(buffer.parameters().format());
-      lv.upload(buffer);
+      VertexBuffer lv = getAndBindBuffer(arg.m_ynljvjjc().format());
+      lv.upload(arg);
       return lv;
    }
 
Only in namedTargetSrc/com/mojang/blaze3d/vertex: BuiltBuffer.java
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2024-08-07 03:59:24.301182738 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2024-08-07 03:58:15.409046909 +0000
@@ -35,15 +35,13 @@
     */
    private final float scale;
    /**
-    * @mapping {@literal hashed f_lslnrhbv Lnet/minecraft/unmapped/C_hfcesdco;f_lslnrhbv:Lorg/joml/Vector3f;}
-    * @mapping {@literal named position Lcom/mojang/blaze3d/vertex/OverlayVertexConsumer;position:Lorg/joml/Vector3f;}
+    * Mapping not found
     */
-   private final Vector3f position = new Vector3f();
+   private final Vector3f f_lslnrhbv = new Vector3f();
    /**
-    * @mapping {@literal hashed f_chouutmi Lnet/minecraft/unmapped/C_hfcesdco;f_chouutmi:Lorg/joml/Vector3f;}
-    * @mapping {@literal named normal Lcom/mojang/blaze3d/vertex/OverlayVertexConsumer;normal:Lorg/joml/Vector3f;}
+    * Mapping not found
     */
-   private final Vector3f normal = new Vector3f();
+   private final Vector3f f_chouutmi = new Vector3f();
    /**
     * @mapping {@literal hashed f_kxbfqszn Lnet/minecraft/unmapped/C_hfcesdco;f_kxbfqszn:F}
     * @mapping {@literal named x Lcom/mojang/blaze3d/vertex/OverlayVertexConsumer;x:F}
@@ -75,11 +73,11 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer xyz(float x, float y, float z) {
-      this.x = x;
-      this.y = y;
-      this.z = z;
-      this.delegate.xyz(x, y, z);
+   public VertexConsumer m_yvdedzif(float f, float g, float h) {
+      this.x = f;
+      this.y = g;
+      this.z = h;
+      this.delegate.m_yvdedzif(f, g, h);
       return this;
    }
 
@@ -87,8 +85,8 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer color(int r, int g, int b, int a) {
-      this.delegate.color(-1);
+   public VertexConsumer m_wnzjlyty(int i, int j, int k, int l) {
+      this.delegate.m_ppknjxpl(-1);
       return this;
    }
 
@@ -96,7 +94,7 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer uv0(float u, float v) {
+   public VertexConsumer m_dtuhivbh(float f, float g) {
       return this;
    }
 
@@ -104,8 +102,8 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer uv1(int u, int v) {
-      this.delegate.uv1(u, v);
+   public VertexConsumer m_dbgftfke(int i, int j) {
+      this.delegate.m_dbgftfke(i, j);
       return this;
    }
 
@@ -113,8 +111,8 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer uv2(int u, int v) {
-      this.delegate.uv2(u, v);
+   public VertexConsumer m_xhzhhqoo(int i, int j) {
+      this.delegate.m_xhzhhqoo(i, j);
       return this;
    }
 
@@ -122,15 +120,15 @@
     * Mapping not found
     */
    @Override
-   public VertexConsumer normal(float normalX, float normalY, float normalZ) {
-      this.delegate.normal(normalX, normalY, normalZ);
-      Vector3f vector3f = this.normalInverseMatrix.transform(normalX, normalY, normalZ, this.normal);
+   public VertexConsumer m_nlxhvdzj(float f, float g, float h) {
+      this.delegate.m_nlxhvdzj(f, g, h);
+      Vector3f vector3f = this.normalInverseMatrix.transform(f, g, h, this.f_chouutmi);
       Direction lv = Direction.getFacing(vector3f.x(), vector3f.y(), vector3f.z());
-      Vector3f vector3f2 = this.cameraInverseMatrix.transformPosition(this.x, this.y, this.z, this.position);
+      Vector3f vector3f2 = this.cameraInverseMatrix.transformPosition(this.x, this.y, this.z, this.f_lslnrhbv);
       vector3f2.rotateY((float) Math.PI);
       vector3f2.rotateX((float) (-Math.PI / 2));
       vector3f2.rotate(lv.getRotationQuaternion());
-      this.delegate.uv0(-vector3f2.x() * this.scale, -vector3f2.y() * this.scale);
+      this.delegate.m_dtuhivbh(-vector3f2.x() * this.scale, -vector3f2.y() * this.scale);
       return this;
    }
 }
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/Tessellator.java namedSrc/com/mojang/blaze3d/vertex/Tessellator.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/Tessellator.java	2024-08-07 03:59:24.089182321 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/Tessellator.java	2024-08-07 03:58:15.145046382 +0000
@@ -2,6 +2,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.unmapped.C_wcwbedxs;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -16,10 +17,9 @@
     */
    private static final int MAX_BYTES = 786432;
    /**
-    * @mapping {@literal hashed f_zakalkut Lnet/minecraft/unmapped/C_hiiunyvh;f_zakalkut:Lnet/minecraft/unmapped/C_wcwbedxs;}
-    * @mapping {@literal named buffer Lcom/mojang/blaze3d/vertex/Tessellator;buffer:Lcom/mojang/blaze3d/vertex/Buffer;}
+    * Mapping not found
     */
-   private final Buffer buffer;
+   private final C_wcwbedxs f_zakalkut;
    /**
     * @mapping {@literal hashed f_qfqyykse Lnet/minecraft/unmapped/C_hiiunyvh;f_qfqyykse:Lnet/minecraft/unmapped/C_hiiunyvh;}
     * @mapping {@literal named instance Lcom/mojang/blaze3d/vertex/Tessellator;instance:Lcom/mojang/blaze3d/vertex/Tessellator;}
@@ -56,7 +56,7 @@
     * @mapping {@literal named <init> Lcom/mojang/blaze3d/vertex/Tessellator;<init>(I)V}
     */
    public Tessellator(int bufferCapacity) {
-      this.buffer = new Buffer(bufferCapacity);
+      this.f_zakalkut = new C_wcwbedxs(bufferCapacity);
    }
 
    /**
@@ -68,17 +68,16 @@
 
    /**
     * @mapping {@literal hashed m_zvrvcpdt Lnet/minecraft/unmapped/C_hiiunyvh;m_zvrvcpdt(Lnet/minecraft/unmapped/C_rnldvdpe$C_ptsbsfse;Lnet/minecraft/unmapped/C_rnldvdpe;)Lnet/minecraft/unmapped/C_nxnqmnng;}
-    * @mapping {@literal named begin Lcom/mojang/blaze3d/vertex/Tessellator;begin(Lcom/mojang/blaze3d/vertex/VertexFormat$DrawMode;Lcom/mojang/blaze3d/vertex/VertexFormat;)Lcom/mojang/blaze3d/vertex/BufferBuilder;}
+    * @mapping {@literal named m_zvrvcpdt Lcom/mojang/blaze3d/vertex/Tessellator;m_zvrvcpdt(Lcom/mojang/blaze3d/vertex/VertexFormat$DrawMode;Lcom/mojang/blaze3d/vertex/VertexFormat;)Lcom/mojang/blaze3d/vertex/BufferBuilder;}
     */
-   public BufferBuilder begin(VertexFormat.DrawMode drawMode, VertexFormat format) {
-      return new BufferBuilder(this.buffer, drawMode, format);
+   public BufferBuilder m_zvrvcpdt(VertexFormat.DrawMode drawMode, VertexFormat format) {
+      return new BufferBuilder(this.f_zakalkut, drawMode, format);
    }
 
    /**
-    * @mapping {@literal hashed m_qmxalmqa Lnet/minecraft/unmapped/C_hiiunyvh;m_qmxalmqa()V}
-    * @mapping {@literal named clear Lcom/mojang/blaze3d/vertex/Tessellator;clear()V}
+    * Mapping not found
     */
-   public void clear() {
-      this.buffer.clear();
+   public void m_qmxalmqa() {
+      this.f_zakalkut.m_fkoojxjp();
    }
 }
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/VertexBuffer.java namedSrc/com/mojang/blaze3d/vertex/VertexBuffer.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/VertexBuffer.java	2024-08-07 03:59:24.301182738 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexBuffer.java	2024-08-07 03:58:15.413046917 +0000
@@ -7,6 +7,8 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.ShaderProgram;
+import net.minecraft.unmapped.C_fpcijbbg;
+import net.minecraft.unmapped.C_wcwbedxs;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 import org.lwjgl.opengl.GL15;
@@ -79,10 +81,10 @@
 
    /**
     * @mapping {@literal hashed m_vazvcsbq Lnet/minecraft/unmapped/C_lhjdxjis;m_vazvcsbq(Lnet/minecraft/unmapped/C_fpcijbbg;)V}
-    * @mapping {@literal named upload Lcom/mojang/blaze3d/vertex/VertexBuffer;upload(Lcom/mojang/blaze3d/vertex/BuiltBuffer;)V}
+    * @mapping {@literal named upload Lcom/mojang/blaze3d/vertex/VertexBuffer;upload(Lnet/minecraft/unmapped/C_fpcijbbg;)V}
     */
-   public void upload(BuiltBuffer buffer) {
-      BuiltBuffer var2 = buffer;
+   public void upload(C_fpcijbbg arg) {
+      C_fpcijbbg var2 = arg;
 
       label40: {
          try {
@@ -91,14 +93,14 @@
             }
 
             RenderSystem.assertOnRenderThread();
-            BuiltBuffer.DrawParameters lv = buffer.parameters();
-            this.vertexFormat = this.uploadAndBindFormat(lv, buffer.vertexBuffer());
-            this.indexBuffer = this.uploadIndices(lv, buffer.indexBuffer());
+            C_fpcijbbg.C_nrbitmxm lv = arg.m_ynljvjjc();
+            this.vertexFormat = this.uploadAndBindFormat(lv, arg.m_fdcjqeyx());
+            this.indexBuffer = this.m_uyubtzgd(lv, arg.m_unbsjhff());
             this.indexCount = lv.indexCount();
             this.indexType = lv.indexType();
             this.drawMode = lv.mode();
          } catch (Throwable var6) {
-            if (buffer != null) {
+            if (arg != null) {
                try {
                   var2.close();
                } catch (Throwable var5) {
@@ -109,24 +111,23 @@
             throw var6;
          }
 
-         if (buffer != null) {
-            buffer.close();
+         if (arg != null) {
+            arg.close();
          }
 
          return;
       }
 
-      if (buffer != null) {
-         buffer.close();
+      if (arg != null) {
+         arg.close();
       }
    }
 
    /**
-    * @mapping {@literal hashed m_ldddkcyb Lnet/minecraft/unmapped/C_lhjdxjis;m_ldddkcyb(Lnet/minecraft/unmapped/C_wcwbedxs$C_thqtmwcx;)V}
-    * @mapping {@literal named uploadView Lcom/mojang/blaze3d/vertex/VertexBuffer;uploadView(Lcom/mojang/blaze3d/vertex/Buffer$View;)V}
+    * Mapping not found
     */
-   public void uploadView(Buffer.View view) {
-      Buffer.View var2 = view;
+   public void m_ldddkcyb(C_wcwbedxs.C_thqtmwcx arg) {
+      C_wcwbedxs.C_thqtmwcx var2 = arg;
 
       label40: {
          try {
@@ -136,10 +137,10 @@
 
             RenderSystem.assertOnRenderThread();
             GlStateManager._glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, this.indexBufferId);
-            RenderSystem.glBufferData(34963, view.getBuffer(), this.usage.id);
+            RenderSystem.glBufferData(34963, arg.m_mhsuiyan(), this.usage.id);
             this.indexBuffer = null;
          } catch (Throwable var6) {
-            if (view != null) {
+            if (arg != null) {
                try {
                   var2.close();
                } catch (Throwable var5) {
@@ -150,31 +151,31 @@
             throw var6;
          }
 
-         if (view != null) {
-            view.close();
+         if (arg != null) {
+            arg.close();
          }
 
          return;
       }
 
-      if (view != null) {
-         view.close();
+      if (arg != null) {
+         arg.close();
       }
    }
 
    /**
     * @mapping {@literal hashed m_scxwshbc Lnet/minecraft/unmapped/C_lhjdxjis;m_scxwshbc(Lnet/minecraft/unmapped/C_fpcijbbg$C_nrbitmxm;Ljava/nio/ByteBuffer;)Lnet/minecraft/unmapped/C_rnldvdpe;}
-    * @mapping {@literal named uploadAndBindFormat Lcom/mojang/blaze3d/vertex/VertexBuffer;uploadAndBindFormat(Lcom/mojang/blaze3d/vertex/BuiltBuffer$DrawParameters;Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/vertex/VertexFormat;}
+    * @mapping {@literal named uploadAndBindFormat Lcom/mojang/blaze3d/vertex/VertexBuffer;uploadAndBindFormat(Lnet/minecraft/unmapped/C_fpcijbbg$C_nrbitmxm;Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   private VertexFormat uploadAndBindFormat(BuiltBuffer.DrawParameters parameters, @Nullable ByteBuffer bytes) {
+   private VertexFormat uploadAndBindFormat(C_fpcijbbg.C_nrbitmxm arg, @Nullable ByteBuffer bytes) {
       boolean bl = false;
-      if (!parameters.format().equals(this.vertexFormat)) {
+      if (!arg.format().equals(this.vertexFormat)) {
          if (this.vertexFormat != null) {
             this.vertexFormat.clearAttribState();
          }
 
          GlStateManager._glBindBuffer(GL15.GL_ARRAY_BUFFER, this.vertexBufferId);
-         parameters.format().setupAttribState();
+         arg.format().setupAttribState();
          bl = true;
       }
 
@@ -186,23 +187,23 @@
          RenderSystem.glBufferData(34962, bytes, this.usage.id);
       }
 
-      return parameters.format();
+      return arg.format();
    }
 
    /**
     * @mapping {@literal hashed m_uyubtzgd Lnet/minecraft/unmapped/C_lhjdxjis;m_uyubtzgd(Lnet/minecraft/unmapped/C_fpcijbbg$C_nrbitmxm;Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/systems/RenderSystem$C_qjasdctt;}
-    * @mapping {@literal named uploadIndices Lcom/mojang/blaze3d/vertex/VertexBuffer;uploadIndices(Lcom/mojang/blaze3d/vertex/BuiltBuffer$DrawParameters;Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/systems/RenderSystem$IndexBuffer;}
+    * @mapping {@literal named m_uyubtzgd Lcom/mojang/blaze3d/vertex/VertexBuffer;m_uyubtzgd(Lnet/minecraft/unmapped/C_fpcijbbg$C_nrbitmxm;Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/systems/RenderSystem$IndexBuffer;}
     */
    @Nullable
-   private RenderSystem.IndexBuffer uploadIndices(BuiltBuffer.DrawParameters parameters, @Nullable ByteBuffer data) {
+   private RenderSystem.IndexBuffer m_uyubtzgd(C_fpcijbbg.C_nrbitmxm arg, @Nullable ByteBuffer data) {
       if (data != null) {
          GlStateManager._glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, this.indexBufferId);
          RenderSystem.glBufferData(34963, data, this.usage.id);
          return null;
       } else {
-         RenderSystem.IndexBuffer lv = RenderSystem.getSequentialBuffer(parameters.mode());
-         if (lv != this.indexBuffer || !lv.hasSize(parameters.indexCount())) {
-            lv.bindWithSize(parameters.indexCount());
+         RenderSystem.IndexBuffer lv = RenderSystem.getSequentialBuffer(arg.mode());
+         if (lv != this.indexBuffer || !lv.hasSize(arg.indexCount())) {
+            lv.bindWithSize(arg.indexCount());
          }
 
          return lv;
@@ -261,7 +262,7 @@
     * @mapping {@literal named drawInternal Lcom/mojang/blaze3d/vertex/VertexBuffer;drawInternal(Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/client/render/ShaderProgram;)V}
     */
    private void drawInternal(Matrix4f viewMatrix, Matrix4f projectionMatrix, ShaderProgram shader) {
-      shader.bindUniforms(this.drawMode, viewMatrix, projectionMatrix, MinecraftClient.getInstance().getWindow());
+      shader.m_uivgtqis(this.drawMode, viewMatrix, projectionMatrix, MinecraftClient.getInstance().getWindow());
       shader.bind();
       this.drawElements();
       shader.unbind();

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/VertexConsumer.java namedSrc/com/mojang/blaze3d/vertex/VertexConsumer.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/VertexConsumer.java	2024-08-07 03:59:24.329182793 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexConsumer.java	2024-08-07 03:58:15.457047005 +0000
@@ -19,114 +19,101 @@
 @Environment(EnvType.CLIENT)
 public interface VertexConsumer {
    /**
-    * @mapping {@literal hashed m_yvdedzif Lnet/minecraft/unmapped/C_igthdzux;m_yvdedzif(FFF)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named xyz Lcom/mojang/blaze3d/vertex/VertexConsumer;xyz(FFF)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   VertexConsumer xyz(float x, float y, float z);
+   VertexConsumer m_yvdedzif(float f, float g, float h);
 
    /**
-    * @mapping {@literal hashed m_wnzjlyty Lnet/minecraft/unmapped/C_igthdzux;m_wnzjlyty(IIII)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named color Lcom/mojang/blaze3d/vertex/VertexConsumer;color(IIII)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   VertexConsumer color(int r, int g, int b, int a);
+   VertexConsumer m_wnzjlyty(int i, int j, int k, int l);
 
    /**
-    * @mapping {@literal hashed m_dtuhivbh Lnet/minecraft/unmapped/C_igthdzux;m_dtuhivbh(FF)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named uv0 Lcom/mojang/blaze3d/vertex/VertexConsumer;uv0(FF)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   VertexConsumer uv0(float u, float v);
+   VertexConsumer m_dtuhivbh(float f, float g);
 
    /**
-    * @mapping {@literal hashed m_dbgftfke Lnet/minecraft/unmapped/C_igthdzux;m_dbgftfke(II)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named uv1 Lcom/mojang/blaze3d/vertex/VertexConsumer;uv1(II)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   VertexConsumer uv1(int u, int v);
+   VertexConsumer m_dbgftfke(int i, int j);
 
    /**
-    * @mapping {@literal hashed m_xhzhhqoo Lnet/minecraft/unmapped/C_igthdzux;m_xhzhhqoo(II)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named uv2 Lcom/mojang/blaze3d/vertex/VertexConsumer;uv2(II)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   VertexConsumer uv2(int u, int v);
+   VertexConsumer m_xhzhhqoo(int i, int j);
 
    /**
-    * @mapping {@literal hashed m_nlxhvdzj Lnet/minecraft/unmapped/C_igthdzux;m_nlxhvdzj(FFF)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named normal Lcom/mojang/blaze3d/vertex/VertexConsumer;normal(FFF)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   VertexConsumer normal(float normalX, float normalY, float normalZ);
+   VertexConsumer m_nlxhvdzj(float f, float g, float h);
 
    /**
-    * @mapping {@literal hashed m_dchtfeel Lnet/minecraft/unmapped/C_igthdzux;m_dchtfeel(FFFIFFIIFFF)V}
-    * @mapping {@literal named addVertex Lcom/mojang/blaze3d/vertex/VertexConsumer;addVertex(FFFIFFIIFFF)V}
+    * Mapping not found
     */
-   default void addVertex(float x, float y, float z, int argb, float u, float v, int uv1, int uv2, float normalX, float normalY, float normalZ) {
-      this.xyz(x, y, z);
-      this.color(argb);
-      this.uv0(u, v);
-      this.uv1(uv1);
-      this.uv2(uv2);
-      this.normal(normalX, normalY, normalZ);
+   default void m_dchtfeel(float f, float g, float h, int i, float j, float k, int l, int m, float n, float o, float p) {
+      this.m_yvdedzif(f, g, h);
+      this.m_ppknjxpl(i);
+      this.m_dtuhivbh(j, k);
+      this.m_sjawvctb(l);
+      this.m_gvxlcabh(m);
+      this.m_nlxhvdzj(n, o, p);
    }
 
    /**
-    * @mapping {@literal hashed m_rkcdaclm Lnet/minecraft/unmapped/C_igthdzux;m_rkcdaclm(FFFF)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named color Lcom/mojang/blaze3d/vertex/VertexConsumer;color(FFFF)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer color(float r, float g, float b, float a) {
-      return this.color((int)(r * 255.0F), (int)(g * 255.0F), (int)(b * 255.0F), (int)(a * 255.0F));
+   default VertexConsumer m_rkcdaclm(float f, float g, float h, float i) {
+      return this.m_wnzjlyty((int)(f * 255.0F), (int)(g * 255.0F), (int)(h * 255.0F), (int)(i * 255.0F));
    }
 
    /**
-    * @mapping {@literal hashed m_ppknjxpl Lnet/minecraft/unmapped/C_igthdzux;m_ppknjxpl(I)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named color Lcom/mojang/blaze3d/vertex/VertexConsumer;color(I)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer color(int argb) {
-      return this.color(ColorUtil.Argb32.getRed(argb), ColorUtil.Argb32.getGreen(argb), ColorUtil.Argb32.getBlue(argb), ColorUtil.Argb32.getAlpha(argb));
+   default VertexConsumer m_ppknjxpl(int i) {
+      return this.m_wnzjlyty(ColorUtil.Argb32.getRed(i), ColorUtil.Argb32.getGreen(i), ColorUtil.Argb32.getBlue(i), ColorUtil.Argb32.getAlpha(i));
    }
 
    /**
     * @mapping {@literal hashed m_piqbzcma Lnet/minecraft/unmapped/C_igthdzux;m_piqbzcma(I)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named rgb Lcom/mojang/blaze3d/vertex/VertexConsumer;rgb(I)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * @mapping {@literal named m_piqbzcma Lcom/mojang/blaze3d/vertex/VertexConsumer;m_piqbzcma(I)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
     */
-   default VertexConsumer rgb(int rgb) {
-      return this.color(ColorUtil.Argb32.of(rgb, -1));
+   default VertexConsumer m_piqbzcma(int rgb) {
+      return this.m_ppknjxpl(ColorUtil.Argb32.of(rgb, -1));
    }
 
    /**
-    * @mapping {@literal hashed m_gvxlcabh Lnet/minecraft/unmapped/C_igthdzux;m_gvxlcabh(I)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named uv2 Lcom/mojang/blaze3d/vertex/VertexConsumer;uv2(I)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer uv2(int uv) {
-      return this.uv2(uv & 65535, uv >> 16 & 65535);
+   default VertexConsumer m_gvxlcabh(int i) {
+      return this.m_xhzhhqoo(i & 65535, i >> 16 & 65535);
    }
 
    /**
-    * @mapping {@literal hashed m_sjawvctb Lnet/minecraft/unmapped/C_igthdzux;m_sjawvctb(I)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named uv1 Lcom/mojang/blaze3d/vertex/VertexConsumer;uv1(I)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer uv1(int uv) {
-      return this.uv1(uv & 65535, uv >> 16 & 65535);
+   default VertexConsumer m_sjawvctb(int i) {
+      return this.m_dbgftfke(i & 65535, i >> 16 & 65535);
    }
 
    /**
-    * @mapping {@literal hashed m_lfqzeqoc Lnet/minecraft/unmapped/C_igthdzux;m_lfqzeqoc(Lnet/minecraft/unmapped/C_cnszsxvd$C_pqokfevb;Lnet/minecraft/unmapped/C_jblhunwf;FFFFII)V}
-    * @mapping {@literal named quad Lcom/mojang/blaze3d/vertex/VertexConsumer;quad(Lnet/minecraft/client/util/math/MatrixStack$Entry;Lnet/minecraft/client/render/model/BakedQuad;FFFFII)V}
+    * Mapping not found
     */
-   default void quad(MatrixStack.Entry matrix, BakedQuad quad, float r, float g, float b, float alpha, int uv1, int v) {
-      this.quad(matrix, quad, new float[]{1.0F, 1.0F, 1.0F, 1.0F}, r, g, b, alpha, new int[]{uv1, uv1, uv1, uv1}, v, false);
+   default void m_lfqzeqoc(MatrixStack.Entry arg, BakedQuad arg2, float f, float g, float h, float i, int j, int k) {
+      this.m_amtheixm(arg, arg2, new float[]{1.0F, 1.0F, 1.0F, 1.0F}, f, g, h, i, new int[]{j, j, j, j}, k, false);
    }
 
    /**
-    * @mapping {@literal hashed m_amtheixm Lnet/minecraft/unmapped/C_igthdzux;m_amtheixm(Lnet/minecraft/unmapped/C_cnszsxvd$C_pqokfevb;Lnet/minecraft/unmapped/C_jblhunwf;[FFFFF[IIZ)V}
-    * @mapping {@literal named quad Lcom/mojang/blaze3d/vertex/VertexConsumer;quad(Lnet/minecraft/client/util/math/MatrixStack$Entry;Lnet/minecraft/client/render/model/BakedQuad;[FFFFF[IIZ)V}
+    * Mapping not found
     */
-   default void quad(MatrixStack.Entry matrix, BakedQuad quad, float[] brightness, float r, float g, float b, float alpha, int[] uv1, int v, boolean blendColor) {
-      int[] js = quad.getVertexData();
-      Vec3i lv = quad.getFace().getVector();
-      Matrix4f matrix4f = matrix.getModel();
-      Vector3f vector3f = matrix.transformNormal((float)lv.getX(), (float)lv.getY(), (float)lv.getZ(), new Vector3f());
+   default void m_amtheixm(MatrixStack.Entry arg, BakedQuad arg2, float[] fs, float f, float g, float h, float i, int[] is, int j, boolean bl) {
+      int[] js = arg2.getVertexData();
+      Vec3i lv = arg2.getFace().getVector();
+      Matrix4f matrix4f = arg.getModel();
+      Vector3f vector3f = arg.m_xityczkk((float)lv.getX(), (float)lv.getY(), (float)lv.getZ(), new Vector3f());
       int k = 8;
       int l = js.length / 8;
-      int m = (int)(alpha * 255.0F);
+      int m = (int)(i * 255.0F);
 
       try (MemoryStack memoryStack = MemoryStack.stackPush()) {
          ByteBuffer byteBuffer = memoryStack.malloc(VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL.getVertexSize());
@@ -139,70 +126,65 @@
             float p = byteBuffer.getFloat(4);
             float q = byteBuffer.getFloat(8);
             float u;
-            float vx;
+            float v;
             float w;
-            if (blendColor) {
-               float rx = (float)(byteBuffer.get(12) & 255);
+            if (bl) {
+               float r = (float)(byteBuffer.get(12) & 255);
                float s = (float)(byteBuffer.get(13) & 255);
                float t = (float)(byteBuffer.get(14) & 255);
-               u = rx * brightness[n] * r;
-               vx = s * brightness[n] * g;
-               w = t * brightness[n] * b;
+               u = r * fs[n] * f;
+               v = s * fs[n] * g;
+               w = t * fs[n] * h;
             } else {
-               u = brightness[n] * r * 255.0F;
-               vx = brightness[n] * g * 255.0F;
-               w = brightness[n] * b * 255.0F;
+               u = fs[n] * f * 255.0F;
+               v = fs[n] * g * 255.0F;
+               w = fs[n] * h * 255.0F;
             }
 
-            int aa = ColorUtil.Argb32.of(m, (int)u, (int)vx, (int)w);
-            int ab = uv1[n];
+            int aa = ColorUtil.Argb32.of(m, (int)u, (int)v, (int)w);
+            int ab = is[n];
             float ac = byteBuffer.getFloat(16);
             float ad = byteBuffer.getFloat(20);
             Vector3f vector3f2 = matrix4f.transformPosition(o, p, q, new Vector3f());
-            this.addVertex(vector3f2.x(), vector3f2.y(), vector3f2.z(), aa, ac, ad, v, ab, vector3f.x(), vector3f.y(), vector3f.z());
+            this.m_dchtfeel(vector3f2.x(), vector3f2.y(), vector3f2.z(), aa, ac, ad, j, ab, vector3f.x(), vector3f.y(), vector3f.z());
          }
       }
    }
 
    /**
-    * @mapping {@literal hashed m_pqmbgdyp Lnet/minecraft/unmapped/C_igthdzux;m_pqmbgdyp(Lorg/joml/Vector3f;)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named xyz Lcom/mojang/blaze3d/vertex/VertexConsumer;xyz(Lorg/joml/Vector3f;)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer xyz(Vector3f pos) {
-      return this.xyz(pos.x(), pos.y(), pos.z());
+   default VertexConsumer m_pqmbgdyp(Vector3f vector3f) {
+      return this.m_yvdedzif(vector3f.x(), vector3f.y(), vector3f.z());
    }
 
    /**
-    * @mapping {@literal hashed m_wwnlxyfc Lnet/minecraft/unmapped/C_igthdzux;m_wwnlxyfc(Lnet/minecraft/unmapped/C_cnszsxvd$C_pqokfevb;Lorg/joml/Vector3f;)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named xyz Lcom/mojang/blaze3d/vertex/VertexConsumer;xyz(Lnet/minecraft/client/util/math/MatrixStack$Entry;Lorg/joml/Vector3f;)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer xyz(MatrixStack.Entry matrix, Vector3f pos) {
-      return this.xyz(matrix, pos.x(), pos.y(), pos.z());
+   default VertexConsumer m_wwnlxyfc(MatrixStack.Entry arg, Vector3f vector3f) {
+      return this.m_mwyfdtgj(arg, vector3f.x(), vector3f.y(), vector3f.z());
    }
 
    /**
-    * @mapping {@literal hashed m_mwyfdtgj Lnet/minecraft/unmapped/C_igthdzux;m_mwyfdtgj(Lnet/minecraft/unmapped/C_cnszsxvd$C_pqokfevb;FFF)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named xyz Lcom/mojang/blaze3d/vertex/VertexConsumer;xyz(Lnet/minecraft/client/util/math/MatrixStack$Entry;FFF)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer xyz(MatrixStack.Entry matrix, float x, float y, float z) {
-      return this.xyz(matrix.getModel(), x, y, z);
+   default VertexConsumer m_mwyfdtgj(MatrixStack.Entry arg, float f, float g, float h) {
+      return this.m_qrpqjixa(arg.getModel(), f, g, h);
    }
 
    /**
-    * @mapping {@literal hashed m_qrpqjixa Lnet/minecraft/unmapped/C_igthdzux;m_qrpqjixa(Lorg/joml/Matrix4f;FFF)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named xyz Lcom/mojang/blaze3d/vertex/VertexConsumer;xyz(Lorg/joml/Matrix4f;FFF)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer xyz(Matrix4f matrix, float x, float y, float z) {
-      Vector3f vector3f = matrix.transformPosition(x, y, z, new Vector3f());
-      return this.xyz(vector3f.x(), vector3f.y(), vector3f.z());
+   default VertexConsumer m_qrpqjixa(Matrix4f matrix4f, float f, float g, float h) {
+      Vector3f vector3f = matrix4f.transformPosition(f, g, h, new Vector3f());
+      return this.m_yvdedzif(vector3f.x(), vector3f.y(), vector3f.z());
    }
 
    /**
-    * @mapping {@literal hashed m_izxhkyih Lnet/minecraft/unmapped/C_igthdzux;m_izxhkyih(Lnet/minecraft/unmapped/C_cnszsxvd$C_pqokfevb;FFF)Lnet/minecraft/unmapped/C_igthdzux;}
-    * @mapping {@literal named normal Lcom/mojang/blaze3d/vertex/VertexConsumer;normal(Lnet/minecraft/client/util/math/MatrixStack$Entry;FFF)Lcom/mojang/blaze3d/vertex/VertexConsumer;}
+    * Mapping not found
     */
-   default VertexConsumer normal(MatrixStack.Entry matrix, float normalX, float normalY, float normalZ) {
-      Vector3f vector3f = matrix.transformNormal(normalX, normalY, normalZ, new Vector3f());
-      return this.normal(vector3f.x(), vector3f.y(), vector3f.z());
+   default VertexConsumer m_izxhkyih(MatrixStack.Entry arg, float f, float g, float h) {
+      Vector3f vector3f = arg.m_xityczkk(f, g, h, new Vector3f());
+      return this.m_nlxhvdzj(vector3f.x(), vector3f.y(), vector3f.z());
    }
 }
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/VertexConsumers.java namedSrc/com/mojang/blaze3d/vertex/VertexConsumers.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/VertexConsumers.java	2024-08-07 03:59:24.137182415 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexConsumers.java	2024-08-07 03:58:15.205046502 +0000
@@ -84,9 +84,9 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer xyz(float x, float y, float z) {
-         this.first.xyz(x, y, z);
-         this.second.xyz(x, y, z);
+      public VertexConsumer m_yvdedzif(float f, float g, float h) {
+         this.first.m_yvdedzif(f, g, h);
+         this.second.m_yvdedzif(f, g, h);
          return this;
       }
 
@@ -94,9 +94,9 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer color(int r, int g, int b, int a) {
-         this.first.color(r, g, b, a);
-         this.second.color(r, g, b, a);
+      public VertexConsumer m_wnzjlyty(int i, int j, int k, int l) {
+         this.first.m_wnzjlyty(i, j, k, l);
+         this.second.m_wnzjlyty(i, j, k, l);
          return this;
       }
 
@@ -104,9 +104,9 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer uv0(float u, float v) {
-         this.first.uv0(u, v);
-         this.second.uv0(u, v);
+      public VertexConsumer m_dtuhivbh(float f, float g) {
+         this.first.m_dtuhivbh(f, g);
+         this.second.m_dtuhivbh(f, g);
          return this;
       }
 
@@ -114,9 +114,9 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer uv1(int u, int v) {
-         this.first.uv1(u, v);
-         this.second.uv1(u, v);
+      public VertexConsumer m_dbgftfke(int i, int j) {
+         this.first.m_dbgftfke(i, j);
+         this.second.m_dbgftfke(i, j);
          return this;
       }
 
@@ -124,9 +124,9 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer uv2(int u, int v) {
-         this.first.uv2(u, v);
-         this.second.uv2(u, v);
+      public VertexConsumer m_xhzhhqoo(int i, int j) {
+         this.first.m_xhzhhqoo(i, j);
+         this.second.m_xhzhhqoo(i, j);
          return this;
       }
 
@@ -134,9 +134,9 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer normal(float normalX, float normalY, float normalZ) {
-         this.first.normal(normalX, normalY, normalZ);
-         this.second.normal(normalX, normalY, normalZ);
+      public VertexConsumer m_nlxhvdzj(float f, float g, float h) {
+         this.first.m_nlxhvdzj(f, g, h);
+         this.second.m_nlxhvdzj(f, g, h);
          return this;
       }
 
@@ -144,9 +144,9 @@
        * Mapping not found
        */
       @Override
-      public void addVertex(float x, float y, float z, int argb, float u, float v, int uv1, int uv2, float normalX, float normalY, float normalZ) {
-         this.first.addVertex(x, y, z, argb, u, v, uv1, uv2, normalX, normalY, normalZ);
-         this.second.addVertex(x, y, z, argb, u, v, uv1, uv2, normalX, normalY, normalZ);
+      public void m_dchtfeel(float f, float g, float h, int i, float j, float k, int l, int m, float n, float o, float p) {
+         this.first.m_dchtfeel(f, g, h, i, j, k, l, m, n, o, p);
+         this.second.m_dchtfeel(f, g, h, i, j, k, l, m, n, o, p);
       }
    }
 
@@ -186,8 +186,8 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer xyz(float x, float y, float z) {
-         this.delegate(arg -> arg.xyz(x, y, z));
+      public VertexConsumer m_yvdedzif(float f, float g, float h) {
+         this.delegate(arg -> arg.m_yvdedzif(f, g, h));
          return this;
       }
 
@@ -195,8 +195,8 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer color(int r, int g, int b, int a) {
-         this.delegate(arg -> arg.color(r, g, b, a));
+      public VertexConsumer m_wnzjlyty(int i, int j, int k, int l) {
+         this.delegate(arg -> arg.m_wnzjlyty(i, j, k, l));
          return this;
       }
 
@@ -204,8 +204,8 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer uv0(float u, float v) {
-         this.delegate(arg -> arg.uv0(u, v));
+      public VertexConsumer m_dtuhivbh(float f, float g) {
+         this.delegate(arg -> arg.m_dtuhivbh(f, g));
          return this;
       }
 
@@ -213,8 +213,8 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer uv1(int u, int v) {
-         this.delegate(arg -> arg.uv1(u, v));
+      public VertexConsumer m_dbgftfke(int i, int j) {
+         this.delegate(arg -> arg.m_dbgftfke(i, j));
          return this;
       }
 
@@ -222,8 +222,8 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer uv2(int u, int v) {
-         this.delegate(arg -> arg.uv2(u, v));
+      public VertexConsumer m_xhzhhqoo(int i, int j) {
+         this.delegate(arg -> arg.m_xhzhhqoo(i, j));
          return this;
       }
 
@@ -231,8 +231,8 @@
        * Mapping not found
        */
       @Override
-      public VertexConsumer normal(float normalX, float normalY, float normalZ) {
-         this.delegate(arg -> arg.normal(normalX, normalY, normalZ));
+      public VertexConsumer m_nlxhvdzj(float f, float g, float h) {
+         this.delegate(arg -> arg.m_nlxhvdzj(f, g, h));
          return this;
       }
 
@@ -240,8 +240,8 @@
        * Mapping not found
        */
       @Override
-      public void addVertex(float x, float y, float z, int argb, float u, float v, int uv1, int uv2, float normalX, float normalY, float normalZ) {
-         this.delegate(arg -> arg.addVertex(x, y, z, argb, u, v, uv1, uv2, normalX, normalY, normalZ));
+      public void m_dchtfeel(float f, float g, float h, int i, float j, float k, int l, int m, float n, float o, float p) {
+         this.delegate(arg -> arg.m_dchtfeel(f, g, h, i, j, k, l, m, n, o, p));
       }
    }
 }
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/VertexFormatElement.java namedSrc/com/mojang/blaze3d/vertex/VertexFormatElement.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/VertexFormatElement.java	2024-08-07 03:59:24.181182502 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexFormatElement.java	2024-08-07 03:58:15.261046613 +0000
@@ -20,63 +20,57 @@
 @Environment(EnvType.CLIENT)
 public record VertexFormatElement(int id, int textureIndex, VertexFormatElement.DataType dataType, VertexFormatElement.Type type, int count) {
    /**
-    * @mapping {@literal hashed f_wxpndoxb Lnet/minecraft/unmapped/C_gmhefnuu;f_wxpndoxb:I}
-    * @mapping {@literal named MAX_ELEMENTS Lcom/mojang/blaze3d/vertex/VertexFormatElement;MAX_ELEMENTS:I}
+    * Mapping not found
     */
-   public static final int MAX_ELEMENTS = 32;
+   public static final int f_wxpndoxb = 32;
    /**
-    * @mapping {@literal hashed f_utmindlu Lnet/minecraft/unmapped/C_gmhefnuu;f_utmindlu:[Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named BY_ID Lcom/mojang/blaze3d/vertex/VertexFormatElement;BY_ID:[Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * Mapping not found
     */
-   private static final VertexFormatElement[] BY_ID = new VertexFormatElement[32];
+   private static final VertexFormatElement[] f_utmindlu = new VertexFormatElement[32];
    /**
-    * @mapping {@literal hashed f_ioecivvl Lnet/minecraft/unmapped/C_gmhefnuu;f_ioecivvl:Ljava/util/List;}
-    * @mapping {@literal named ELEMENTS Lcom/mojang/blaze3d/vertex/VertexFormatElement;ELEMENTS:Ljava/util/List;}
+    * Mapping not found
     */
-   private static final List<VertexFormatElement> ELEMENTS = new ArrayList(32);
+   private static final List<VertexFormatElement> f_ioecivvl = new ArrayList(32);
    /**
-    * @mapping {@literal hashed f_ikjjihsm Lnet/minecraft/unmapped/C_gmhefnuu;f_ikjjihsm:Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named POSITION Lcom/mojang/blaze3d/vertex/VertexFormatElement;POSITION:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * Mapping not found
     */
-   public static final VertexFormatElement POSITION = register(0, 0, VertexFormatElement.DataType.FLOAT, VertexFormatElement.Type.POSITION, 3);
+   public static final VertexFormatElement f_ikjjihsm = m_qpjskeed(0, 0, VertexFormatElement.DataType.FLOAT, VertexFormatElement.Type.POSITION, 3);
    /**
     * @mapping {@literal hashed f_cqhlyllo Lnet/minecraft/unmapped/C_gmhefnuu;f_cqhlyllo:Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named COLOR Lcom/mojang/blaze3d/vertex/VertexFormatElement;COLOR:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * @mapping {@literal named UBYTE Lcom/mojang/blaze3d/vertex/VertexFormatElement;UBYTE:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
     */
-   public static final VertexFormatElement COLOR = register(1, 0, VertexFormatElement.DataType.UBYTE, VertexFormatElement.Type.COLOR, 4);
+   public static final VertexFormatElement UBYTE = m_qpjskeed(1, 0, VertexFormatElement.DataType.UBYTE, VertexFormatElement.Type.COLOR, 4);
    /**
     * @mapping {@literal hashed f_iinntpxc Lnet/minecraft/unmapped/C_gmhefnuu;f_iinntpxc:Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named UV0 Lcom/mojang/blaze3d/vertex/VertexFormatElement;UV0:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * @mapping {@literal named FLOAT Lcom/mojang/blaze3d/vertex/VertexFormatElement;FLOAT:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
     */
-   public static final VertexFormatElement UV0 = register(2, 0, VertexFormatElement.DataType.FLOAT, VertexFormatElement.Type.UV, 2);
+   public static final VertexFormatElement FLOAT = m_qpjskeed(2, 0, VertexFormatElement.DataType.FLOAT, VertexFormatElement.Type.UV, 2);
    /**
-    * @mapping {@literal hashed f_goltcokt Lnet/minecraft/unmapped/C_gmhefnuu;f_goltcokt:Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named UV Lcom/mojang/blaze3d/vertex/VertexFormatElement;UV:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * Mapping not found
     */
-   public static final VertexFormatElement UV = UV0;
+   public static final VertexFormatElement f_goltcokt = FLOAT;
    /**
-    * @mapping {@literal hashed f_zggaqqby Lnet/minecraft/unmapped/C_gmhefnuu;f_zggaqqby:Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named UV1 Lcom/mojang/blaze3d/vertex/VertexFormatElement;UV1:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * Mapping not found
     */
-   public static final VertexFormatElement UV1 = register(3, 1, VertexFormatElement.DataType.SHORT, VertexFormatElement.Type.UV, 2);
+   public static final VertexFormatElement f_zggaqqby = m_qpjskeed(3, 1, VertexFormatElement.DataType.SHORT, VertexFormatElement.Type.UV, 2);
    /**
     * @mapping {@literal hashed f_fcpplnvy Lnet/minecraft/unmapped/C_gmhefnuu;f_fcpplnvy:Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named UV2 Lcom/mojang/blaze3d/vertex/VertexFormatElement;UV2:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * @mapping {@literal named SHORT Lcom/mojang/blaze3d/vertex/VertexFormatElement;SHORT:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
     */
-   public static final VertexFormatElement UV2 = register(4, 2, VertexFormatElement.DataType.SHORT, VertexFormatElement.Type.UV, 2);
+   public static final VertexFormatElement SHORT = m_qpjskeed(4, 2, VertexFormatElement.DataType.SHORT, VertexFormatElement.Type.UV, 2);
    /**
     * @mapping {@literal hashed f_xztpytmk Lnet/minecraft/unmapped/C_gmhefnuu;f_xztpytmk:Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named NORMAL Lcom/mojang/blaze3d/vertex/VertexFormatElement;NORMAL:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * @mapping {@literal named BYTE Lcom/mojang/blaze3d/vertex/VertexFormatElement;BYTE:Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
     */
-   public static final VertexFormatElement NORMAL = register(5, 0, VertexFormatElement.DataType.BYTE, VertexFormatElement.Type.NORMAL, 3);
+   public static final VertexFormatElement BYTE = m_qpjskeed(5, 0, VertexFormatElement.DataType.BYTE, VertexFormatElement.Type.NORMAL, 3);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gmhefnuu;<init>(IILnet/minecraft/unmapped/C_gmhefnuu$C_vbjzjwyy;Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn;I)V}
     * @mapping {@literal named <init> Lcom/mojang/blaze3d/vertex/VertexFormatElement;<init>(IILcom/mojang/blaze3d/vertex/VertexFormatElement$DataType;Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;I)V}
     */
    public VertexFormatElement(int id, int textureIndex, VertexFormatElement.DataType dataType, VertexFormatElement.Type type, int count) {
-      if (id < 0 || id >= BY_ID.length) {
-         throw new IllegalArgumentException("Element ID must be in range [0; " + BY_ID.length + ")");
+      if (id < 0 || id >= f_utmindlu.length) {
+         throw new IllegalArgumentException("Element ID must be in range [0; " + f_utmindlu.length + ")");
       } else if (!this.isValidType(textureIndex, type)) {
          throw new IllegalStateException("Multiple vertex elements of the same type other than UVs are not supported");
       } else {
@@ -90,15 +84,15 @@
 
    /**
     * @mapping {@literal hashed m_qpjskeed Lnet/minecraft/unmapped/C_gmhefnuu;m_qpjskeed(IILnet/minecraft/unmapped/C_gmhefnuu$C_vbjzjwyy;Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn;I)Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named register Lcom/mojang/blaze3d/vertex/VertexFormatElement;register(IILcom/mojang/blaze3d/vertex/VertexFormatElement$DataType;Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;I)Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * @mapping {@literal named m_qpjskeed Lcom/mojang/blaze3d/vertex/VertexFormatElement;m_qpjskeed(IILcom/mojang/blaze3d/vertex/VertexFormatElement$DataType;Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;I)Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
     */
-   public static VertexFormatElement register(int id, int textureIndex, VertexFormatElement.DataType dataType, VertexFormatElement.Type type, int count) {
+   public static VertexFormatElement m_qpjskeed(int id, int textureIndex, VertexFormatElement.DataType dataType, VertexFormatElement.Type type, int count) {
       VertexFormatElement lv = new VertexFormatElement(id, textureIndex, dataType, type, count);
-      if (BY_ID[id] != null) {
+      if (f_utmindlu[id] != null) {
          throw new IllegalArgumentException("Duplicate element registration for: " + id);
       } else {
-         BY_ID[id] = lv;
-         ELEMENTS.add(lv);
+         f_utmindlu[id] = lv;
+         f_ioecivvl.add(lv);
          return lv;
       }
    }
@@ -119,19 +113,17 @@
    }
 
    /**
-    * @mapping {@literal hashed m_iqqimcab Lnet/minecraft/unmapped/C_gmhefnuu;m_iqqimcab()I}
-    * @mapping {@literal named mask Lcom/mojang/blaze3d/vertex/VertexFormatElement;mask()I}
+    * Mapping not found
     */
-   public int mask() {
+   public int m_iqqimcab() {
       return 1 << this.id;
    }
 
    /**
-    * @mapping {@literal hashed m_bsqvoafi Lnet/minecraft/unmapped/C_gmhefnuu;m_bsqvoafi()I}
-    * @mapping {@literal named size Lcom/mojang/blaze3d/vertex/VertexFormatElement;size()I}
+    * Mapping not found
     */
-   public int size() {
-      return this.dataType.size() * this.count;
+   public int m_bsqvoafi() {
+      return this.dataType.m_rmzcyrpt() * this.count;
    }
 
    /**
@@ -139,24 +131,22 @@
     * @mapping {@literal named setupAttribState Lcom/mojang/blaze3d/vertex/VertexFormatElement;setupAttribState(IJI)V}
     */
    public void setupAttribState(int elementIndex, long pointer, int stride) {
-      this.type.starter.setupBufferState(this.count, this.dataType.id(), stride, pointer, elementIndex);
+      this.type.starter.setupBufferState(this.count, this.dataType.m_oinoavvk(), stride, pointer, elementIndex);
    }
 
    /**
-    * @mapping {@literal hashed m_epbsefpy Lnet/minecraft/unmapped/C_gmhefnuu;m_epbsefpy(I)Lnet/minecraft/unmapped/C_gmhefnuu;}
-    * @mapping {@literal named byId Lcom/mojang/blaze3d/vertex/VertexFormatElement;byId(I)Lcom/mojang/blaze3d/vertex/VertexFormatElement;}
+    * Mapping not found
     */
    @Nullable
-   public static VertexFormatElement byId(int id) {
-      return BY_ID[id];
+   public static VertexFormatElement m_epbsefpy(int i) {
+      return f_utmindlu[i];
    }
 
    /**
-    * @mapping {@literal hashed m_cjrjryfl Lnet/minecraft/unmapped/C_gmhefnuu;m_cjrjryfl(I)Ljava/util/stream/Stream;}
-    * @mapping {@literal named stream Lcom/mojang/blaze3d/vertex/VertexFormatElement;stream(I)Ljava/util/stream/Stream;}
+    * Mapping not found
     */
-   public static Stream<VertexFormatElement> stream(int ids) {
-      return ELEMENTS.stream().filter(element -> element != null && (ids & element.mask()) != 0);
+   public static Stream<VertexFormatElement> m_cjrjryfl(int i) {
+      return f_ioecivvl.stream().filter(arg -> arg != null && (i & arg.m_iqqimcab()) != 0);
    }
 
    /**
@@ -252,18 +242,16 @@
       }
 
       /**
-       * @mapping {@literal hashed m_rmzcyrpt Lnet/minecraft/unmapped/C_gmhefnuu$C_vbjzjwyy;m_rmzcyrpt()I}
-       * @mapping {@literal named size Lcom/mojang/blaze3d/vertex/VertexFormatElement$DataType;size()I}
+       * Mapping not found
        */
-      public int size() {
+      public int m_rmzcyrpt() {
          return this.byteLength;
       }
 
       /**
-       * @mapping {@literal hashed m_oinoavvk Lnet/minecraft/unmapped/C_gmhefnuu$C_vbjzjwyy;m_oinoavvk()I}
-       * @mapping {@literal named id Lcom/mojang/blaze3d/vertex/VertexFormatElement$DataType;id()I}
+       * Mapping not found
        */
-      public int id() {
+      public int m_oinoavvk() {
          return this.id;
       }
 
@@ -290,7 +278,7 @@
        * @mapping {@literal hashed f_fxvzbhhi Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn;f_fxvzbhhi:Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn;}
        * @mapping {@literal named NORMAL Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;NORMAL:Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;}
        */
-      NORMAL("Normal", (size, type, stride, pointer, textureIndex) -> GlStateManager._vertexAttribPointer(textureIndex, size, type, true, stride, pointer)),
+      NORMAL("Normal", (textureIndex, elementIndex, k, l, m) -> GlStateManager._vertexAttribPointer(m, textureIndex, elementIndex, true, k, l)),
       /**
        * @mapping {@literal hashed f_ikjrldso Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn;f_ikjrldso:Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn;}
        * @mapping {@literal named COLOR Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;COLOR:Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;}
@@ -300,11 +288,11 @@
        * @mapping {@literal hashed f_zkauxbgr Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn;f_zkauxbgr:Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn;}
        * @mapping {@literal named UV Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;UV:Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type;}
        */
-      UV("UV", (size, type, stride, pointer, textureIndex) -> {
-         if (type == 5126) {
-            GlStateManager._vertexAttribPointer(textureIndex, size, type, false, stride, pointer);
+      UV("UV", (textureIndex, elementIndex, k, l, m) -> {
+         if (elementIndex == 5126) {
+            GlStateManager._vertexAttribPointer(m, textureIndex, elementIndex, false, k, l);
          } else {
-            GlStateManager._vertexAttribIPointer(textureIndex, size, type, stride, pointer);
+            GlStateManager._vertexAttribIPointer(m, textureIndex, elementIndex, k, l);
          }
       }),
       /**
@@ -348,10 +336,9 @@
       @Environment(EnvType.CLIENT)
       interface Begin {
          /**
-          * @mapping {@literal hashed setupBufferState Lnet/minecraft/unmapped/C_gmhefnuu$C_kjyxhofn$C_jenloete;setupBufferState(IIIJI)V}
-          * @mapping {@literal named setupBufferState Lcom/mojang/blaze3d/vertex/VertexFormatElement$Type$Begin;setupBufferState(IIIJI)V}
+          * Mapping not found
           */
-         void setupBufferState(int size, int type, int stride, long pointer, int textureIndex);
+         void setupBufferState(int i, int j, int k, long l, int m);
       }
    }
 }
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/VertexFormat.java namedSrc/com/mojang/blaze3d/vertex/VertexFormat.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/VertexFormat.java	2024-08-07 03:59:24.381182896 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexFormat.java	2024-08-07 03:58:15.537047165 +0000
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
@@ -19,35 +20,31 @@
 @Environment(EnvType.CLIENT)
 public class VertexFormat {
    /**
-    * @mapping {@literal hashed f_xqnvzjmq Lnet/minecraft/unmapped/C_rnldvdpe;f_xqnvzjmq:I}
-    * @mapping {@literal named INVALID_ELEMENT Lcom/mojang/blaze3d/vertex/VertexFormat;INVALID_ELEMENT:I}
+    * Mapping not found
     */
-   public static final int INVALID_ELEMENT = -1;
+   public static final int f_xqnvzjmq = -1;
    /**
     * @mapping {@literal hashed f_thnfzsnr Lnet/minecraft/unmapped/C_rnldvdpe;f_thnfzsnr:Ljava/util/List;}
     * @mapping {@literal named elements Lcom/mojang/blaze3d/vertex/VertexFormat;elements:Ljava/util/List;}
     */
    private final List<VertexFormatElement> elements;
    /**
-    * @mapping {@literal hashed f_hplpxqvf Lnet/minecraft/unmapped/C_rnldvdpe;f_hplpxqvf:Ljava/util/List;}
-    * @mapping {@literal named attributes Lcom/mojang/blaze3d/vertex/VertexFormat;attributes:Ljava/util/List;}
+    * Mapping not found
     */
-   private final List<String> attributes;
+   private final List<String> f_hplpxqvf;
    /**
     * @mapping {@literal hashed f_magvnmca Lnet/minecraft/unmapped/C_rnldvdpe;f_magvnmca:I}
     * @mapping {@literal named size Lcom/mojang/blaze3d/vertex/VertexFormat;size:I}
     */
    private final int size;
    /**
-    * @mapping {@literal hashed f_cjphjbaz Lnet/minecraft/unmapped/C_rnldvdpe;f_cjphjbaz:I}
-    * @mapping {@literal named mask Lcom/mojang/blaze3d/vertex/VertexFormat;mask:I}
+    * Mapping not found
     */
-   private final int mask;
+   private final int f_cjphjbaz;
    /**
-    * @mapping {@literal hashed f_hbjccuou Lnet/minecraft/unmapped/C_rnldvdpe;f_hbjccuou:[I}
-    * @mapping {@literal named attributeIndices Lcom/mojang/blaze3d/vertex/VertexFormat;attributeIndices:[I}
+    * Mapping not found
     */
-   private final int[] attributeIndices = new int[32];
+   private final int[] f_hbjccuou = new int[32];
    /**
     * @mapping {@literal hashed f_eaizqugu Lnet/minecraft/unmapped/C_rnldvdpe;f_eaizqugu:Lnet/minecraft/unmapped/C_lhjdxjis;}
     * @mapping {@literal named buffer Lcom/mojang/blaze3d/vertex/VertexFormat;buffer:Lcom/mojang/blaze3d/vertex/VertexBuffer;}
@@ -59,25 +56,24 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rnldvdpe;<init>(Ljava/util/List;Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;I)V}
     * @mapping {@literal named <init> Lcom/mojang/blaze3d/vertex/VertexFormat;<init>(Ljava/util/List;Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;I)V}
     */
-   VertexFormat(List<VertexFormatElement> elements, List<String> attributes, IntList offsets, int size) {
+   VertexFormat(List<VertexFormatElement> elements, List<String> list2, IntList intList, int size) {
       this.elements = elements;
-      this.attributes = attributes;
+      this.f_hplpxqvf = list2;
       this.size = size;
-      this.mask = elements.stream().mapToInt(VertexFormatElement::mask).reduce(0, (i, jx) -> i | jx);
+      this.f_cjphjbaz = elements.stream().mapToInt(VertexFormatElement::m_iqqimcab).reduce(0, (i, jx) -> i | jx);
 
-      for (int j = 0; j < this.attributeIndices.length; j++) {
-         VertexFormatElement lv = VertexFormatElement.byId(j);
+      for (int j = 0; j < this.f_hbjccuou.length; j++) {
+         VertexFormatElement lv = VertexFormatElement.m_epbsefpy(j);
          int k = lv != null ? elements.indexOf(lv) : -1;
-         this.attributeIndices[j] = k != -1 ? offsets.getInt(k) : -1;
+         this.f_hbjccuou[j] = k != -1 ? intList.getInt(k) : -1;
       }
    }
 
    /**
-    * @mapping {@literal hashed m_sqevultz Lnet/minecraft/unmapped/C_rnldvdpe;m_sqevultz()Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;}
-    * @mapping {@literal named builder Lcom/mojang/blaze3d/vertex/VertexFormat;builder()Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;}
+    * Mapping not found
     */
-   public static VertexFormat.Builder builder() {
-      return new VertexFormat.Builder();
+   public static VertexFormat.C_ykggrxts m_sqevultz() {
+      return new VertexFormat.C_ykggrxts();
    }
 
    /**
@@ -90,11 +86,11 @@
          VertexFormatElement lv = (VertexFormatElement)this.elements.get(i);
          stringBuilder.append(i)
             .append(". ")
-            .append((String)this.attributes.get(i))
+            .append((String)this.f_hplpxqvf.get(i))
             .append(": ")
             .append(lv)
             .append(" @ ")
-            .append(this.getAttributeIndex(lv))
+            .append(this.m_tdtabkti(lv))
             .append('\n');
       }
 
@@ -122,51 +118,46 @@
     * @mapping {@literal named getShaderAttributes Lcom/mojang/blaze3d/vertex/VertexFormat;getShaderAttributes()Ljava/util/List;}
     */
    public List<String> getShaderAttributes() {
-      return this.attributes;
+      return this.f_hplpxqvf;
    }
 
    /**
-    * @mapping {@literal hashed m_zildndhz Lnet/minecraft/unmapped/C_rnldvdpe;m_zildndhz()[I}
-    * @mapping {@literal named getAttributeIndices Lcom/mojang/blaze3d/vertex/VertexFormat;getAttributeIndices()[I}
+    * Mapping not found
     */
-   public int[] getAttributeIndices() {
-      return this.attributeIndices;
+   public int[] m_zildndhz() {
+      return this.f_hbjccuou;
    }
 
    /**
-    * @mapping {@literal hashed m_tdtabkti Lnet/minecraft/unmapped/C_rnldvdpe;m_tdtabkti(Lnet/minecraft/unmapped/C_gmhefnuu;)I}
-    * @mapping {@literal named getAttributeIndex Lcom/mojang/blaze3d/vertex/VertexFormat;getAttributeIndex(Lcom/mojang/blaze3d/vertex/VertexFormatElement;)I}
+    * Mapping not found
     */
-   public int getAttributeIndex(VertexFormatElement element) {
-      return this.attributeIndices[element.id()];
+   public int m_tdtabkti(VertexFormatElement arg) {
+      return this.f_hbjccuou[arg.id()];
    }
 
    /**
-    * @mapping {@literal hashed m_itfposxz Lnet/minecraft/unmapped/C_rnldvdpe;m_itfposxz(Lnet/minecraft/unmapped/C_gmhefnuu;)Z}
-    * @mapping {@literal named contains Lcom/mojang/blaze3d/vertex/VertexFormat;contains(Lcom/mojang/blaze3d/vertex/VertexFormatElement;)Z}
+    * Mapping not found
     */
-   public boolean contains(VertexFormatElement element) {
-      return (this.mask & element.mask()) != 0;
+   public boolean m_itfposxz(VertexFormatElement arg) {
+      return (this.f_cjphjbaz & arg.m_iqqimcab()) != 0;
    }
 
    /**
-    * @mapping {@literal hashed m_xxfnxtpe Lnet/minecraft/unmapped/C_rnldvdpe;m_xxfnxtpe()I}
-    * @mapping {@literal named getMask Lcom/mojang/blaze3d/vertex/VertexFormat;getMask()I}
+    * Mapping not found
     */
-   public int getMask() {
-      return this.mask;
+   public int m_xxfnxtpe() {
+      return this.f_cjphjbaz;
    }
 
    /**
-    * @mapping {@literal hashed m_fyghzmni Lnet/minecraft/unmapped/C_rnldvdpe;m_fyghzmni(Lnet/minecraft/unmapped/C_gmhefnuu;)Ljava/lang/String;}
-    * @mapping {@literal named getAttributeName Lcom/mojang/blaze3d/vertex/VertexFormat;getAttributeName(Lcom/mojang/blaze3d/vertex/VertexFormatElement;)Ljava/lang/String;}
+    * Mapping not found
     */
-   public String getAttributeName(VertexFormatElement element) {
-      int i = this.elements.indexOf(element);
+   public String m_fyghzmni(VertexFormatElement arg) {
+      int i = this.elements.indexOf(arg);
       if (i == -1) {
-         throw new IllegalArgumentException(element + " is not contained in format");
+         throw new IllegalArgumentException(arg + " is not contained in format");
       } else {
-         return (String)this.attributes.get(i);
+         return (String)this.f_hplpxqvf.get(i);
       }
    }
 
@@ -179,10 +170,10 @@
          return true;
       } else {
          if (o instanceof VertexFormat lv
-            && this.mask == lv.mask
+            && this.f_cjphjbaz == lv.f_cjphjbaz
             && this.size == lv.size
-            && this.attributes.equals(lv.attributes)
-            && Arrays.equals(this.attributeIndices, lv.attributeIndices)) {
+            && this.f_hplpxqvf.equals(lv.f_hplpxqvf)
+            && Arrays.equals(this.f_hbjccuou, lv.f_hbjccuou)) {
             return true;
          }
 
@@ -194,7 +185,7 @@
     * Mapping not found
     */
    public int hashCode() {
-      return this.mask * 31 + Arrays.hashCode(this.attributeIndices);
+      return this.f_cjphjbaz * 31 + Arrays.hashCode(this.f_hbjccuou);
    }
 
    /**
@@ -219,7 +210,7 @@
       for (int j = 0; j < this.elements.size(); j++) {
          GlStateManager._enableVertexAttribArray(j);
          VertexFormatElement lv = (VertexFormatElement)this.elements.get(j);
-         lv.setupAttribState(j, (long)this.getAttributeIndex(lv), i);
+         lv.setupAttribState(j, (long)this.m_tdtabkti(lv), i);
       }
    }
 
@@ -260,61 +251,56 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_rnldvdpe$C_ykggrxts}
-    * @mapping {@literal named com/mojang/blaze3d/vertex/VertexFormat$Builder}
+    * @mapping {@literal named com/mojang/blaze3d/vertex/VertexFormat$C_ykggrxts}
     */
    @Environment(EnvType.CLIENT)
-   public static class Builder {
+   public static class C_ykggrxts {
       /**
-       * @mapping {@literal hashed f_xnjzdyal Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;f_xnjzdyal:Lcom/google/common/collect/ImmutableMap$Builder;}
-       * @mapping {@literal named elements Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;elements:Lcom/google/common/collect/ImmutableMap$Builder;}
+       * Mapping not found
        */
-      private final ImmutableMap.Builder<String, VertexFormatElement> elements = ImmutableMap.builder();
+      private final Builder<String, VertexFormatElement> f_xnjzdyal = ImmutableMap.builder();
       /**
-       * @mapping {@literal hashed f_qswkwhrt Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;f_qswkwhrt:Lit/unimi/dsi/fastutil/ints/IntList;}
-       * @mapping {@literal named offsets Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;offsets:Lit/unimi/dsi/fastutil/ints/IntList;}
+       * Mapping not found
        */
-      private final IntList offsets = new IntArrayList();
+      private final IntList f_qswkwhrt = new IntArrayList();
       /**
-       * @mapping {@literal hashed f_dxthypxa Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;f_dxthypxa:I}
-       * @mapping {@literal named stride Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;stride:I}
+       * Mapping not found
        */
-      private int stride;
+      private int f_dxthypxa;
 
       /**
        * Mapping not found
        */
-      Builder() {
+      C_ykggrxts() {
       }
 
       /**
        * @mapping {@literal hashed m_lbvtnvip Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;m_lbvtnvip(Ljava/lang/String;Lnet/minecraft/unmapped/C_gmhefnuu;)Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;}
-       * @mapping {@literal named addElement Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;addElement(Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormatElement;)Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;}
+       * @mapping {@literal named m_lbvtnvip Lcom/mojang/blaze3d/vertex/VertexFormat$C_ykggrxts;m_lbvtnvip(Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormatElement;)Lcom/mojang/blaze3d/vertex/VertexFormat$C_ykggrxts;}
        */
-      public VertexFormat.Builder addElement(String attribute, VertexFormatElement element) {
-         this.elements.put(attribute, element);
-         this.offsets.add(this.stride);
-         this.stride = this.stride + element.size();
+      public VertexFormat.C_ykggrxts m_lbvtnvip(String key, VertexFormatElement value) {
+         this.f_xnjzdyal.put(key, value);
+         this.f_qswkwhrt.add(this.f_dxthypxa);
+         this.f_dxthypxa = this.f_dxthypxa + value.m_bsqvoafi();
          return this;
       }
 
       /**
-       * @mapping {@literal hashed m_zofztfkz Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;m_zofztfkz(I)Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;}
-       * @mapping {@literal named skip Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;skip(I)Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;}
+       * Mapping not found
        */
-      public VertexFormat.Builder skip(int bytes) {
-         this.stride += bytes;
+      public VertexFormat.C_ykggrxts m_zofztfkz(int i) {
+         this.f_dxthypxa += i;
          return this;
       }
 
       /**
-       * @mapping {@literal hashed m_bprhncfv Lnet/minecraft/unmapped/C_rnldvdpe$C_ykggrxts;m_bprhncfv()Lnet/minecraft/unmapped/C_rnldvdpe;}
-       * @mapping {@literal named build Lcom/mojang/blaze3d/vertex/VertexFormat$Builder;build()Lcom/mojang/blaze3d/vertex/VertexFormat;}
+       * Mapping not found
        */
-      public VertexFormat build() {
-         ImmutableMap<String, VertexFormatElement> immutableMap = this.elements.buildOrThrow();
+      public VertexFormat m_bprhncfv() {
+         ImmutableMap<String, VertexFormatElement> immutableMap = this.f_xnjzdyal.buildOrThrow();
          ImmutableList<VertexFormatElement> immutableList = immutableMap.values().asList();
          ImmutableList<String> immutableList2 = immutableMap.keySet().asList();
-         return new VertexFormat(immutableList, immutableList2, this.offsets, this.stride);
+         return new VertexFormat(immutableList, immutableList2, this.f_qswkwhrt, this.f_dxthypxa);
       }
    }
 
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/VertexFormats.java namedSrc/com/mojang/blaze3d/vertex/VertexFormats.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/VertexFormats.java	2024-08-07 03:59:24.333182801 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexFormats.java	2024-08-07 03:58:15.461047014 +0000
@@ -13,120 +13,120 @@
     * @mapping {@literal hashed f_dieesrdq Lnet/minecraft/unmapped/C_biptqhre;f_dieesrdq:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named BLIT_SCREEN Lcom/mojang/blaze3d/vertex/VertexFormats;BLIT_SCREEN:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat BLIT_SCREEN = VertexFormat.builder().addElement("Position", VertexFormatElement.POSITION).build();
+   public static final VertexFormat BLIT_SCREEN = VertexFormat.m_sqevultz().m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm).m_bprhncfv();
    /**
     * @mapping {@literal hashed f_ouznresd Lnet/minecraft/unmapped/C_biptqhre;f_ouznresd:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_COLOR_TEXTURE_LIGHT_NORMAL Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_COLOR_TEXTURE_LIGHT_NORMAL:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_COLOR_TEXTURE_LIGHT_NORMAL = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .addElement("UV0", VertexFormatElement.UV0)
-      .addElement("UV2", VertexFormatElement.UV2)
-      .addElement("Normal", VertexFormatElement.NORMAL)
-      .skip(1)
-      .build();
+   public static final VertexFormat POSITION_COLOR_TEXTURE_LIGHT_NORMAL = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_lbvtnvip("UV0", VertexFormatElement.FLOAT)
+      .m_lbvtnvip("UV2", VertexFormatElement.SHORT)
+      .m_lbvtnvip("Normal", VertexFormatElement.BYTE)
+      .m_zofztfkz(1)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_enpcgdcd Lnet/minecraft/unmapped/C_biptqhre;f_enpcgdcd:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .addElement("UV0", VertexFormatElement.UV0)
-      .addElement("UV1", VertexFormatElement.UV1)
-      .addElement("UV2", VertexFormatElement.UV2)
-      .addElement("Normal", VertexFormatElement.NORMAL)
-      .skip(1)
-      .build();
+   public static final VertexFormat POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_lbvtnvip("UV0", VertexFormatElement.FLOAT)
+      .m_lbvtnvip("UV1", VertexFormatElement.f_zggaqqby)
+      .m_lbvtnvip("UV2", VertexFormatElement.SHORT)
+      .m_lbvtnvip("Normal", VertexFormatElement.BYTE)
+      .m_zofztfkz(1)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_ffklxaft Lnet/minecraft/unmapped/C_biptqhre;f_ffklxaft:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_TEXTURE_COLOR_LIGHT Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_TEXTURE_COLOR_LIGHT:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_TEXTURE_COLOR_LIGHT = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("UV0", VertexFormatElement.UV0)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .addElement("UV2", VertexFormatElement.UV2)
-      .build();
+   public static final VertexFormat POSITION_TEXTURE_COLOR_LIGHT = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("UV0", VertexFormatElement.FLOAT)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_lbvtnvip("UV2", VertexFormatElement.SHORT)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_rnugmpqr Lnet/minecraft/unmapped/C_biptqhre;f_rnugmpqr:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION = VertexFormat.builder().addElement("Position", VertexFormatElement.POSITION).build();
+   public static final VertexFormat POSITION = VertexFormat.m_sqevultz().m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm).m_bprhncfv();
    /**
     * @mapping {@literal hashed f_wthzlvlp Lnet/minecraft/unmapped/C_biptqhre;f_wthzlvlp:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_COLOR Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_COLOR:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_COLOR = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .build();
+   public static final VertexFormat POSITION_COLOR = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_zemqduhq Lnet/minecraft/unmapped/C_biptqhre;f_zemqduhq:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named LINES Lcom/mojang/blaze3d/vertex/VertexFormats;LINES:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat LINES = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .addElement("Normal", VertexFormatElement.NORMAL)
-      .skip(1)
-      .build();
+   public static final VertexFormat LINES = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_lbvtnvip("Normal", VertexFormatElement.BYTE)
+      .m_zofztfkz(1)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_mihrbbzm Lnet/minecraft/unmapped/C_biptqhre;f_mihrbbzm:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_COLOR_LIGHT Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_COLOR_LIGHT:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_COLOR_LIGHT = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .addElement("UV2", VertexFormatElement.UV2)
-      .build();
+   public static final VertexFormat POSITION_COLOR_LIGHT = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_lbvtnvip("UV2", VertexFormatElement.SHORT)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_twrzeles Lnet/minecraft/unmapped/C_biptqhre;f_twrzeles:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_TEXTURE Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_TEXTURE:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_TEXTURE = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("UV0", VertexFormatElement.UV0)
-      .build();
+   public static final VertexFormat POSITION_TEXTURE = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("UV0", VertexFormatElement.FLOAT)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_vmlprueo Lnet/minecraft/unmapped/C_biptqhre;f_vmlprueo:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_TEXTURE_COLOR Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_TEXTURE_COLOR:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_TEXTURE_COLOR = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("UV0", VertexFormatElement.UV0)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .build();
+   public static final VertexFormat POSITION_TEXTURE_COLOR = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("UV0", VertexFormatElement.FLOAT)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_nlolfysh Lnet/minecraft/unmapped/C_biptqhre;f_nlolfysh:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_COLOR_TEXTURE_LIGHT Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_COLOR_TEXTURE_LIGHT:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_COLOR_TEXTURE_LIGHT = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .addElement("UV0", VertexFormatElement.UV0)
-      .addElement("UV2", VertexFormatElement.UV2)
-      .build();
+   public static final VertexFormat POSITION_COLOR_TEXTURE_LIGHT = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_lbvtnvip("UV0", VertexFormatElement.FLOAT)
+      .m_lbvtnvip("UV2", VertexFormatElement.SHORT)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_jbgwclzy Lnet/minecraft/unmapped/C_biptqhre;f_jbgwclzy:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_TEXTURE_LIGHT_COLOR Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_TEXTURE_LIGHT_COLOR:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_TEXTURE_LIGHT_COLOR = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("UV0", VertexFormatElement.UV0)
-      .addElement("UV2", VertexFormatElement.UV2)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .build();
+   public static final VertexFormat POSITION_TEXTURE_LIGHT_COLOR = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("UV0", VertexFormatElement.FLOAT)
+      .m_lbvtnvip("UV2", VertexFormatElement.SHORT)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_bprhncfv();
    /**
     * @mapping {@literal hashed f_xniipaeq Lnet/minecraft/unmapped/C_biptqhre;f_xniipaeq:Lnet/minecraft/unmapped/C_rnldvdpe;}
     * @mapping {@literal named POSITION_TEXTURE_COLOR_NORMAL Lcom/mojang/blaze3d/vertex/VertexFormats;POSITION_TEXTURE_COLOR_NORMAL:Lcom/mojang/blaze3d/vertex/VertexFormat;}
     */
-   public static final VertexFormat POSITION_TEXTURE_COLOR_NORMAL = VertexFormat.builder()
-      .addElement("Position", VertexFormatElement.POSITION)
-      .addElement("UV0", VertexFormatElement.UV0)
-      .addElement("Color", VertexFormatElement.COLOR)
-      .addElement("Normal", VertexFormatElement.NORMAL)
-      .skip(1)
-      .build();
+   public static final VertexFormat POSITION_TEXTURE_COLOR_NORMAL = VertexFormat.m_sqevultz()
+      .m_lbvtnvip("Position", VertexFormatElement.f_ikjjihsm)
+      .m_lbvtnvip("UV0", VertexFormatElement.FLOAT)
+      .m_lbvtnvip("Color", VertexFormatElement.UBYTE)
+      .m_lbvtnvip("Normal", VertexFormatElement.BYTE)
+      .m_zofztfkz(1)
+      .m_bprhncfv();
 }
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java namedSrc/net/minecraft/advancement/AdvancementRewards.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java	2024-08-07 03:59:24.317182770 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-08-07 03:58:15.441046973 +0000
@@ -68,7 +68,7 @@
                      SoundEvents.ENTITY_ITEM_PICKUP,
                      SoundCategory.PLAYERS,
                      0.2F,
-                     ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F
+                     ((player.m_dlwxaobh().nextFloat() - player.m_dlwxaobh().nextFloat()) * 0.7F + 1.0F) * 2.0F
                   );
                bl = true;
             } else {

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-08-07 03:59:24.141182424 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-08-07 03:58:15.213046518 +0000
@@ -485,7 +485,7 @@
       if (state.isOpaqueFullCube(world, pos)) {
          return world.getMaxLightLevel();
       } else {
-         return state.isTransparent(world, pos) ? 0 : 1;
+         return state.isTranslucent(world, pos) ? 0 : 1;
       }
    }
 
@@ -819,15 +819,15 @@
       private final boolean replaceable;
       /**
        * @mapping {@literal hashed f_vcrxfhyc Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_vcrxfhyc:Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;}
-       * @mapping {@literal named shapeCache Lnet/minecraft/block/AbstractBlock$AbstractBlockState;shapeCache:Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;}
+       * @mapping {@literal named shapeCache Lnet/minecraft/block/AbstractBlock$AbstractBlockState;shapeCache:Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;}
        */
       @Nullable
-      protected AbstractBlock.AbstractBlockState.Cache shapeCache;
+      protected AbstractBlock.AbstractBlockState.ShapeCache shapeCache;
       /**
        * @mapping {@literal hashed f_smluljei Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_smluljei:Lnet/minecraft/unmapped/C_xqketiuf;}
-       * @mapping {@literal named fluidState Lnet/minecraft/block/AbstractBlock$AbstractBlockState;fluidState:Lnet/minecraft/fluid/FluidState;}
+       * @mapping {@literal named state Lnet/minecraft/block/AbstractBlock$AbstractBlockState;state:Lnet/minecraft/fluid/FluidState;}
        */
-      private FluidState fluidState = Fluids.EMPTY.getDefaultState();
+      private FluidState state = Fluids.EMPTY.getDefaultState();
       /**
        * @mapping {@literal hashed f_xwxdktuf Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_xwxdktuf:Z}
        * @mapping {@literal named hasRandomTicks Lnet/minecraft/block/AbstractBlock$AbstractBlockState;hasRandomTicks:Z}
@@ -889,10 +889,10 @@
        * @mapping {@literal named initShapeCache Lnet/minecraft/block/AbstractBlock$AbstractBlockState;initShapeCache()V}
        */
       public void initShapeCache() {
-         this.fluidState = this.owner.getFluidState(this.asBlockState());
+         this.state = this.owner.getFluidState(this.asBlockState());
          this.hasRandomTicks = this.owner.getRandomTicks(this.asBlockState());
          if (!this.getBlock().hasDynamicBounds()) {
-            this.shapeCache = new AbstractBlock.AbstractBlockState.Cache(this.asBlockState());
+            this.shapeCache = new AbstractBlock.AbstractBlockState.ShapeCache(this.asBlockState());
          }
 
          this.solid = this.checkSolid();
@@ -943,10 +943,10 @@
 
       /**
        * @mapping {@literal hashed m_pppprjpr Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_pppprjpr(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z}
-       * @mapping {@literal named isTransparent Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isTransparent(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Z}
+       * @mapping {@literal named isTranslucent Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isTranslucent(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Z}
        */
-      public boolean isTransparent(BlockView world, BlockPos pos) {
-         return this.shapeCache != null ? this.shapeCache.transparent : this.getBlock().isTransparent(this.asBlockState(), world, pos);
+      public boolean isTranslucent(BlockView world, BlockPos pos) {
+         return this.shapeCache != null ? this.shapeCache.translucent : this.getBlock().isTransparent(this.asBlockState(), world, pos);
       }
 
       /**
@@ -954,7 +954,7 @@
        * @mapping {@literal named getOpacity Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getOpacity(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)I}
        */
       public int getOpacity(BlockView world, BlockPos pos) {
-         return this.shapeCache != null ? this.shapeCache.opacity : this.getBlock().getOpacity(this.asBlockState(), world, pos);
+         return this.shapeCache != null ? this.shapeCache.lightSubtracted : this.getBlock().getOpacity(this.asBlockState(), world, pos);
       }
 
       /**
@@ -1601,7 +1601,7 @@
        * @mapping {@literal named getFluidState Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getFluidState()Lnet/minecraft/fluid/FluidState;}
        */
       public FluidState getFluidState() {
-         return this.fluidState;
+         return this.state;
       }
 
       /**
@@ -1641,14 +1641,14 @@
        * @mapping {@literal named isSideSolidFullSquare Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isSideSolidFullSquare(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;)Z}
        */
       public boolean isSideSolidFullSquare(BlockView world, BlockPos pos, Direction direction) {
-         return this.isSideSolid(world, pos, direction, SideSupportType.FULL);
+         return this.isSideSolid(world, pos, direction, SideShapeType.FULL);
       }
 
       /**
        * @mapping {@literal hashed m_uwpuhtkq Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_uwpuhtkq(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_bermjtpm;)Z}
-       * @mapping {@literal named isSideSolid Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isSideSolid(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/SideSupportType;)Z}
+       * @mapping {@literal named isSideSolid Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isSideSolid(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/SideShapeType;)Z}
        */
-      public boolean isSideSolid(BlockView world, BlockPos pos, Direction direction, SideSupportType shapeType) {
+      public boolean isSideSolid(BlockView world, BlockPos pos, Direction direction, SideShapeType shapeType) {
          return this.shapeCache != null ? this.shapeCache.isSideSolid(direction, shapeType) : shapeType.matches(this.asBlockState(), world, pos, direction);
       }
 
@@ -1692,70 +1692,70 @@
 
       /**
        * @mapping {@literal hashed net/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp}
-       * @mapping {@literal named net/minecraft/block/AbstractBlock$AbstractBlockState$Cache}
+       * @mapping {@literal named net/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache}
        */
-      static final class Cache {
+      static final class ShapeCache {
          /**
           * @mapping {@literal hashed f_vcnjxera Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_vcnjxera:[Lnet/minecraft/unmapped/C_xpuuihxf;}
-          * @mapping {@literal named DIRECTIONS Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;DIRECTIONS:[Lnet/minecraft/util/math/Direction;}
+          * @mapping {@literal named DIRECTIONS Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;DIRECTIONS:[Lnet/minecraft/util/math/Direction;}
           */
          private static final Direction[] DIRECTIONS = Direction.values();
          /**
           * @mapping {@literal hashed f_giukhuuk Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_giukhuuk:I}
-          * @mapping {@literal named SUPPORT_TYPE_COUNT Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;SUPPORT_TYPE_COUNT:I}
+          * @mapping {@literal named SHAPE_TYPE_LENGTH Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;SHAPE_TYPE_LENGTH:I}
           */
-         private static final int SUPPORT_TYPE_COUNT = SideSupportType.values().length;
+         private static final int SHAPE_TYPE_LENGTH = SideShapeType.values().length;
          /**
           * @mapping {@literal hashed f_hnicgtxs Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_hnicgtxs:Z}
-          * @mapping {@literal named fullOpaque Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;fullOpaque:Z}
+          * @mapping {@literal named fullOpaque Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;fullOpaque:Z}
           */
          protected final boolean fullOpaque;
          /**
           * @mapping {@literal hashed f_rradvjop Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_rradvjop:Z}
-          * @mapping {@literal named transparent Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;transparent:Z}
+          * @mapping {@literal named translucent Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;translucent:Z}
           */
-         final boolean transparent;
+         final boolean translucent;
          /**
           * @mapping {@literal hashed f_hyndulfq Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_hyndulfq:I}
-          * @mapping {@literal named opacity Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;opacity:I}
+          * @mapping {@literal named lightSubtracted Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;lightSubtracted:I}
           */
-         final int opacity;
+         final int lightSubtracted;
          /**
           * @mapping {@literal hashed f_vgigayzh Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_vgigayzh:[Lnet/minecraft/unmapped/C_zscvhwbd;}
-          * @mapping {@literal named extrudedFaces Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;extrudedFaces:[Lnet/minecraft/util/shape/VoxelShape;}
+          * @mapping {@literal named extrudedFaces Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;extrudedFaces:[Lnet/minecraft/util/shape/VoxelShape;}
           */
          @Nullable
          final VoxelShape[] extrudedFaces;
          /**
           * @mapping {@literal hashed f_fnubfist Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_fnubfist:Lnet/minecraft/unmapped/C_zscvhwbd;}
-          * @mapping {@literal named collisionShape Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;collisionShape:Lnet/minecraft/util/shape/VoxelShape;}
+          * @mapping {@literal named collisionShape Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;collisionShape:Lnet/minecraft/util/shape/VoxelShape;}
           */
          protected final VoxelShape collisionShape;
          /**
           * @mapping {@literal hashed f_tuezdcrh Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_tuezdcrh:Z}
-          * @mapping {@literal named exceedsCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;exceedsCube:Z}
+          * @mapping {@literal named exceedsCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;exceedsCube:Z}
           */
          protected final boolean exceedsCube;
          /**
           * @mapping {@literal hashed f_edgveesq Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_edgveesq:[Z}
-          * @mapping {@literal named solidSides Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;solidSides:[Z}
+          * @mapping {@literal named solidSides Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;solidSides:[Z}
           */
          private final boolean[] solidSides;
          /**
           * @mapping {@literal hashed f_dvqmhlgw Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;f_dvqmhlgw:Z}
-          * @mapping {@literal named isFullCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;isFullCube:Z}
+          * @mapping {@literal named isFullCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;isFullCube:Z}
           */
          protected final boolean isFullCube;
 
          /**
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;<init>(Lnet/minecraft/unmapped/C_txtbiemp;)V}
-          * @mapping {@literal named <init> Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;<init>(Lnet/minecraft/block/BlockState;)V}
+          * @mapping {@literal named <init> Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;<init>(Lnet/minecraft/block/BlockState;)V}
           */
-         Cache(BlockState state) {
+         ShapeCache(BlockState state) {
             Block lv = state.getBlock();
             this.fullOpaque = state.isOpaqueFullCube(EmptyBlockView.INSTANCE, BlockPos.ORIGIN);
-            this.transparent = lv.isTransparent(state, EmptyBlockView.INSTANCE, BlockPos.ORIGIN);
-            this.opacity = lv.getOpacity(state, EmptyBlockView.INSTANCE, BlockPos.ORIGIN);
+            this.translucent = lv.isTransparent(state, EmptyBlockView.INSTANCE, BlockPos.ORIGIN);
+            this.lightSubtracted = lv.getOpacity(state, EmptyBlockView.INSTANCE, BlockPos.ORIGIN);
             if (!state.isOpaque()) {
                this.extrudedFaces = null;
             } else {
@@ -1779,10 +1779,10 @@
             } else {
                this.exceedsCube = Arrays.stream(Direction.Axis.values())
                   .anyMatch(axis -> this.collisionShape.getMin(axis) < 0.0 || this.collisionShape.getMax(axis) > 1.0);
-               this.solidSides = new boolean[DIRECTIONS.length * SUPPORT_TYPE_COUNT];
+               this.solidSides = new boolean[DIRECTIONS.length * SHAPE_TYPE_LENGTH];
 
                for (Direction lv4 : DIRECTIONS) {
-                  for (SideSupportType lv5 : SideSupportType.values()) {
+                  for (SideShapeType lv5 : SideShapeType.values()) {
                      this.solidSides[indexSolidSide(lv4, lv5)] = lv5.matches(state, EmptyBlockView.INSTANCE, BlockPos.ORIGIN, lv4);
                   }
                }
@@ -1793,18 +1793,18 @@
 
          /**
           * @mapping {@literal hashed m_kfaeaode Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;m_kfaeaode(Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_bermjtpm;)Z}
-          * @mapping {@literal named isSideSolid Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;isSideSolid(Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/SideSupportType;)Z}
+          * @mapping {@literal named isSideSolid Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;isSideSolid(Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/SideShapeType;)Z}
           */
-         public boolean isSideSolid(Direction direction, SideSupportType shapeType) {
+         public boolean isSideSolid(Direction direction, SideShapeType shapeType) {
             return this.solidSides[indexSolidSide(direction, shapeType)];
          }
 
          /**
           * @mapping {@literal hashed m_kvzetxjc Lnet/minecraft/unmapped/C_triydqro$C_eibemhky$C_xmxhiejp;m_kvzetxjc(Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_bermjtpm;)I}
-          * @mapping {@literal named indexSolidSide Lnet/minecraft/block/AbstractBlock$AbstractBlockState$Cache;indexSolidSide(Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/SideSupportType;)I}
+          * @mapping {@literal named indexSolidSide Lnet/minecraft/block/AbstractBlock$AbstractBlockState$ShapeCache;indexSolidSide(Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/SideShapeType;)I}
           */
-         private static int indexSolidSide(Direction direction, SideSupportType shapeType) {
-            return direction.ordinal() * SUPPORT_TYPE_COUNT + shapeType.ordinal();
+         private static int indexSolidSide(Direction direction, SideShapeType shapeType) {
+            return direction.ordinal() * SHAPE_TYPE_LENGTH + shapeType.ordinal();
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/AbstractFireBlock.java namedSrc/net/minecraft/block/AbstractFireBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractFireBlock.java	2024-08-07 03:59:24.125182392 +0000
+++ namedSrc/net/minecraft/block/AbstractFireBlock.java	2024-08-07 03:58:15.189046470 +0000
@@ -173,7 +173,7 @@
       if (!entity.isFireImmune()) {
          entity.setFireTicks(entity.getFireTicks() + 1);
          if (entity.getFireTicks() == 0) {
-            entity.setOnFireForSeconds(8.0F);
+            entity.m_xbkkrydd(8.0F);
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/block/AbstractTorchBlock.java namedSrc/net/minecraft/block/AbstractTorchBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractTorchBlock.java	2024-08-07 03:59:24.173182487 +0000
+++ namedSrc/net/minecraft/block/AbstractTorchBlock.java	2024-08-07 03:58:15.249046590 +0000
@@ -14,10 +14,9 @@
  */
 public abstract class AbstractTorchBlock extends Block {
    /**
-    * @mapping {@literal hashed f_qcgutmrp Lnet/minecraft/unmapped/C_teovrngh;f_qcgutmrp:I}
-    * @mapping {@literal named SHAPE_STANDING_OFFSET Lnet/minecraft/block/AbstractTorchBlock;SHAPE_STANDING_OFFSET:I}
+    * Mapping not found
     */
-   protected static final int SHAPE_STANDING_OFFSET = 2;
+   protected static final int f_qcgutmrp = 2;
    /**
     * @mapping {@literal hashed f_ysrmomgy Lnet/minecraft/unmapped/C_teovrngh;f_ysrmomgy:Lnet/minecraft/unmapped/C_zscvhwbd;}
     * @mapping {@literal named SHAPE Lnet/minecraft/block/AbstractTorchBlock;SHAPE:Lnet/minecraft/util/shape/VoxelShape;}
diff -bur namedTargetSrc/net/minecraft/block/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2024-08-07 03:59:24.285182707 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-08-07 03:58:15.389046869 +0000
@@ -368,7 +368,7 @@
          boolean bl = !lv2.hasNoBees();
          if (bl || i > 0) {
             ItemStack lv3 = new ItemStack(this);
-            lv3.applyComponents(lv2.copyComponents());
+            lv3.applyComponents(lv2.m_jhcvwprs());
             lv3.set(DataComponentTypes.BLOCK_STATE, BlockStateComponent.DEFAULT.with(HONEY_LEVEL, i));
             ItemEntity lv4 = new ItemEntity(world, (double)pos.getX(), (double)pos.getY(), (double)pos.getZ(), lv3);
             lv4.setToDefaultPickupDelay();
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-08-07 03:59:24.381182896 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-08-07 03:58:15.537047165 +0000
@@ -450,7 +450,7 @@
     * @mapping {@literal named hasTopRim Lnet/minecraft/block/Block;hasTopRim(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Z}
     */
    public static boolean hasTopRim(BlockView world, BlockPos pos) {
-      return world.getBlockState(pos).isSideSolid(world, pos, Direction.UP, SideSupportType.RIGID);
+      return world.getBlockState(pos).isSideSolid(world, pos, Direction.UP, SideShapeType.RIGID);
    }
 
    /**
@@ -459,7 +459,7 @@
     */
    public static boolean sideCoversSmallSquare(WorldView world, BlockPos pos, Direction side) {
       BlockState lv = world.getBlockState(pos);
-      return side == Direction.DOWN && lv.isIn(BlockTags.UNSTABLE_BOTTOM_CENTER) ? false : lv.isSideSolid(world, pos, side, SideSupportType.CENTER);
+      return side == Direction.DOWN && lv.isIn(BlockTags.UNSTABLE_BOTTOM_CENTER) ? false : lv.isSideSolid(world, pos, side, SideShapeType.CENTER);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-08-07 03:59:24.189182518 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-08-07 03:58:15.273046638 +0000
@@ -7164,7 +7164,7 @@
             .strength(0.5F)
             .sounds(BlockSoundGroup.GLASS)
             .nonOpaque()
-            .allowsSpawning((state, world, pos, entityType) -> entityType == EntityType.POLAR_BEAR)
+            .allowsSpawning((state, world, pos, type) -> type == EntityType.POLAR_BEAR)
             .solidBlock(Blocks::nonSolid)
       )
    );
@@ -11479,7 +11479,7 @@
             .instrument(NoteBlockInstrument.BASEDRUM)
             .nonOpaque()
             .sounds(BlockSoundGroup.BLOCK_VAULT_BREAK)
-            .luminance(state -> ((VaultState)state.get(VaultBlock.VAULT_STATE)).getLightLevel())
+            .luminance(state -> ((VaultState)state.get(VaultBlock.VAULT_STATE)).m_mrmtyngy())
             .strength(50.0F)
             .blockVision(Blocks::nonSolid)
       )
diff -bur namedTargetSrc/net/minecraft/block/ButtonBlock.java namedSrc/net/minecraft/block/ButtonBlock.java
--- namedTargetSrc/net/minecraft/block/ButtonBlock.java	2024-08-07 03:59:24.193182526 +0000
+++ namedSrc/net/minecraft/block/ButtonBlock.java	2024-08-07 03:58:15.277046646 +0000
@@ -221,7 +221,7 @@
       if ((Boolean)state.get(POWERED)) {
          return ActionResult.CONSUME;
       } else {
-         this.press(state, world, pos, player);
+         this.m_xgiovkgj(state, world, pos, player);
          return ActionResult.success(world.isClient);
       }
    }
@@ -232,7 +232,7 @@
    @Override
    protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
       if (explosion.m_ndwdgdks() && !(Boolean)state.get(POWERED)) {
-         this.press(state, world, pos, null);
+         this.m_xgiovkgj(state, world, pos, null);
       }
 
       super.onExplosion(state, world, pos, explosion, dropConsumer);
@@ -240,9 +240,9 @@
 
    /**
     * @mapping {@literal hashed m_xgiovkgj Lnet/minecraft/unmapped/C_mvguptux;m_xgiovkgj(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;)V}
-    * @mapping {@literal named press Lnet/minecraft/block/ButtonBlock;press(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;)V}
+    * @mapping {@literal named m_xgiovkgj Lnet/minecraft/block/ButtonBlock;m_xgiovkgj(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;)V}
     */
-   public void press(BlockState state, World world, BlockPos pos, @Nullable PlayerEntity player) {
+   public void m_xgiovkgj(BlockState state, World world, BlockPos pos, @Nullable PlayerEntity player) {
       world.setBlockState(pos, state.with(POWERED, Boolean.valueOf(true)), Block.NOTIFY_ALL);
       this.updateNeighbors(state, world, pos);
       world.scheduleBlockTick(pos, this, this.onTicks);
diff -bur namedTargetSrc/net/minecraft/block/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-08-07 03:59:24.301182738 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-08-07 03:58:15.409046909 +0000
@@ -58,8 +58,8 @@
     */
    public static final MapCodec<CampfireBlock> CODEC = RecordCodecBuilder.mapCodec(
       campfire -> campfire.group(
-               Codec.BOOL.fieldOf("spawn_particles").forGetter(block -> block.emitsParticles),
-               Codec.intRange(0, 1000).fieldOf("fire_damage").forGetter(block -> block.fireDamage),
+               Codec.BOOL.fieldOf("spawn_particles").forGetter(arg -> arg.emitsParticles),
+               Codec.intRange(0, 1000).fieldOf("fire_damage").forGetter(arg -> arg.fireDamage),
                getSettingsCodec()
             )
             .apply(campfire, CampfireBlock::new)
@@ -167,7 +167,7 @@
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
       if ((Boolean)state.get(LIT) && entity instanceof LivingEntity) {
-         entity.damage(world.getDamageSources().campfire(), (float)this.fireDamage);
+         entity.damage(world.getDamageSources().m_lxrwzlzj(), (float)this.fireDamage);
       }
 
       super.onEntityCollision(state, world, pos, entity);
diff -bur namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java
--- namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-08-07 03:59:24.129182400 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-08-07 03:58:15.197046486 +0000
@@ -107,7 +107,7 @@
          return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
       } else {
          if (!world.isClient) {
-            ItemStack lv2 = stack.copyComponentsToNewStack(Blocks.SHULKER_BOX, 1);
+            ItemStack lv2 = stack.m_igbhhnoy(Blocks.SHULKER_BOX, 1);
             player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, lv2, false));
             player.incrementStat(Stats.CLEAN_SHULKER_BOX);
             LeveledCauldronBlock.decrementFluidLevel(state, world, pos);
diff -bur namedTargetSrc/net/minecraft/block/ChiseledBookshelfBlock.java namedSrc/net/minecraft/block/ChiseledBookshelfBlock.java
--- namedTargetSrc/net/minecraft/block/ChiseledBookshelfBlock.java	2024-08-07 03:59:24.093182329 +0000
+++ namedSrc/net/minecraft/block/ChiseledBookshelfBlock.java	2024-08-07 03:58:15.153046397 +0000
@@ -204,7 +204,7 @@
       if (!world.isClient) {
          player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem()));
          SoundEvent lv = stack.isOf(Items.ENCHANTED_BOOK) ? SoundEvents.BLOCK_CHISELED_BOOKSHELF_INSERT_ENCHANTED : SoundEvents.BLOCK_CHISELED_BOOKSHELF_INSERT;
-         blockEntity.setStack(slot, stack.copyAndConsume(1, player));
+         blockEntity.setStack(slot, stack.m_tobuehwl(1, player));
          world.playSound(null, pos, lv, SoundCategory.BLOCKS, 1.0F, 1.0F);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/CrafterBlock.java namedSrc/net/minecraft/block/CrafterBlock.java
--- namedTargetSrc/net/minecraft/block/CrafterBlock.java	2024-08-07 03:59:24.161182463 +0000
+++ namedSrc/net/minecraft/block/CrafterBlock.java	2024-08-07 03:58:15.237046565 +0000
@@ -80,10 +80,9 @@
     */
    private static final RecipeCache RECIPE_CACHE = new RecipeCache(10);
    /**
-    * @mapping {@literal hashed f_ivkpvzrt Lnet/minecraft/unmapped/C_dmnruvyr;f_ivkpvzrt:I}
-    * @mapping {@literal named ADVANCEMENT_TRIGGER_RANGE Lnet/minecraft/block/CrafterBlock;ADVANCEMENT_TRIGGER_RANGE:I}
+    * Mapping not found
     */
-   private static final int ADVANCEMENT_TRIGGER_RANGE = 17;
+   private static final int f_ivkpvzrt = 17;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_dmnruvyr;<init>(Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
@@ -239,7 +238,7 @@
    protected void craft(BlockState state, ServerWorld world, BlockPos pos) {
       if (world.getBlockEntity(pos) instanceof CrafterBlockEntity lv) {
          CraftingRecipeInput var11 = lv.toInput();
-         Optional<RecipeHolder<CraftingRecipe>> optional = getFirstMatch(world, var11);
+         Optional<RecipeHolder<CraftingRecipe>> optional = m_jtimyngh(world, var11);
          if (optional.isEmpty()) {
             world.syncWorldEvent(WorldEvents.CRAFTER_FAIL, pos, 0);
          } else {
@@ -272,9 +271,9 @@
 
    /**
     * @mapping {@literal hashed m_jtimyngh Lnet/minecraft/unmapped/C_dmnruvyr;m_jtimyngh(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;}
-    * @mapping {@literal named getFirstMatch Lnet/minecraft/block/CrafterBlock;getFirstMatch(Lnet/minecraft/world/World;Lnet/minecraft/recipe/CraftingRecipeInput;)Ljava/util/Optional;}
+    * @mapping {@literal named m_jtimyngh Lnet/minecraft/block/CrafterBlock;m_jtimyngh(Lnet/minecraft/world/World;Lnet/minecraft/recipe/CraftingRecipeInput;)Ljava/util/Optional;}
     */
-   public static Optional<RecipeHolder<CraftingRecipe>> getFirstMatch(World world, CraftingRecipeInput input) {
+   public static Optional<RecipeHolder<CraftingRecipe>> m_jtimyngh(World world, CraftingRecipeInput input) {
       return RECIPE_CACHE.getFirstMatch(world, input);
    }
 
@@ -282,9 +281,9 @@
     * @mapping {@literal hashed m_wbzysgew Lnet/minecraft/unmapped/C_dmnruvyr;m_wbzysgew(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_lamqkfie;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_dscbrwbj;)V}
     * @mapping {@literal named craft Lnet/minecraft/block/CrafterBlock;craft(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/CrafterBlockEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/block/BlockState;Lnet/minecraft/recipe/RecipeHolder;)V}
     */
-   private void craft(ServerWorld world, BlockPos pos, CrafterBlockEntity blockEntity, ItemStack stack, BlockState state, RecipeHolder<CraftingRecipe> recipe) {
+   private void craft(ServerWorld world, BlockPos pos, CrafterBlockEntity blockEntity, ItemStack stack, BlockState state, RecipeHolder<CraftingRecipe> arg6) {
       Direction lv = ((JigsawOrientation)state.get(ORIENTATION)).getFacing();
-      Inventory lv2 = HopperBlockEntity.findInventory(world, pos.offset(lv));
+      Inventory lv2 = HopperBlockEntity.getInventoryAt(world, pos.offset(lv));
       ItemStack lv3 = stack.copy();
       if (lv2 != null && (lv2 instanceof CrafterBlockEntity || stack.getCount() > lv2.getMaxCount(stack))) {
          while (!lv3.isEmpty()) {
@@ -312,7 +311,7 @@
          ItemDispenserBehavior.spawnItem(world, lv3, 6, lv, lv7);
 
          for (ServerPlayerEntity lv8 : world.getNonSpectatingEntities(ServerPlayerEntity.class, Box.of(lv6, 17.0, 17.0, 17.0))) {
-            Criteria.CRAFTER_RECIPE_CRAFTED.trigger(lv8, recipe.id(), blockEntity.getStacks());
+            Criteria.CRAFTER_RECIPE_CRAFTED.trigger(lv8, arg6.id(), blockEntity.getStacks());
          }
 
          world.syncWorldEvent(WorldEvents.CRAFTER_CRAFT, pos, 0);
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-08-07 03:59:24.129182400 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-08-07 03:58:15.197046486 +0000
@@ -149,9 +149,9 @@
          } else {
             ItemStack lv3 = lv.getStack();
             if (!stack.isEmpty() && (lv3.isEmpty() || ItemStack.itemsAndComponentsMatch(lv3, stack) && lv3.getCount() < lv3.getMaxCount())) {
-               lv.wobble(DecoratedPotBlockEntity.WobbleType.POSITIVE);
+               lv.m_faozmaju(DecoratedPotBlockEntity.WobbleType.POSITIVE);
                player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem()));
-               ItemStack lv4 = stack.copyAndConsume(1, player);
+               ItemStack lv4 = stack.m_tobuehwl(1, player);
                float f;
                if (lv.isEmpty()) {
                   lv.setStack(lv4);
@@ -187,7 +187,7 @@
    protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult result) {
       if (world.getBlockEntity(pos) instanceof DecoratedPotBlockEntity lv) {
          world.playSound(null, pos, SoundEvents.BLOCK_DECORATED_POT_INSERT_FAIL, SoundCategory.BLOCKS, 1.0F, 1.0F);
-         lv.wobble(DecoratedPotBlockEntity.WobbleType.NEGATIVE);
+         lv.m_faozmaju(DecoratedPotBlockEntity.WobbleType.NEGATIVE);
          world.emitGameEvent(player, GameEvent.BLOCK_CHANGE, pos);
          return ActionResult.SUCCESS;
       } else {
@@ -245,7 +245,7 @@
       BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
       if (lv instanceof DecoratedPotBlockEntity lv2) {
          lootParameterBuilder.withDynamicDrop(SHERDS, consumer -> {
-            for (Item lvx : lv2.getSherds().ordered()) {
+            for (Item lvx : lv2.m_rimhwmec().ordered()) {
                consumer.accept(lvx.getDefaultStack());
             }
          });
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-08-07 03:59:24.253182644 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-08-07 03:58:15.349046789 +0000
@@ -328,7 +328,7 @@
             }
 
             if (this.isSuccess()) {
-               stack.damageEquipment(1, lv, null, arg -> {
+               stack.m_hskgqwrk(1, lv, null, arg -> {
                });
             }
 
@@ -524,7 +524,7 @@
             } else {
                for (ArmadilloEntity lv3 : list) {
                   if (lv3.onBrushed()) {
-                     stack.damageEquipment(16, lv, null, arg -> {
+                     stack.m_hskgqwrk(16, lv, null, arg -> {
                      });
                      return stack;
                   }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java namedSrc/net/minecraft/block/dispenser/DispenserBlock.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-08-07 03:59:24.201182542 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-08-07 03:58:15.281046653 +0000
@@ -221,24 +221,20 @@
 
    /**
     * @mapping {@literal hashed m_tfzksanp Lnet/minecraft/unmapped/C_sridforj;m_tfzksanp(Lnet/minecraft/unmapped/C_wzdnszcs;)Lnet/minecraft/unmapped/C_ogbhoqwb;}
-    * @mapping {@literal named getDispensePos Lnet/minecraft/block/dispenser/DispenserBlock;getDispensePos(Lnet/minecraft/util/math/BlockPointer;)Lnet/minecraft/util/math/Position;}
+    * @mapping {@literal named m_tfzksanp Lnet/minecraft/block/dispenser/DispenserBlock;m_tfzksanp(Lnet/minecraft/util/math/BlockPointer;)Lnet/minecraft/util/math/Position;}
     */
-   public static Position getDispensePos(BlockPointer block) {
-      return getDispensePos(block, 0.7, Vec3d.ZERO);
+   public static Position m_tfzksanp(BlockPointer block) {
+      return m_kmtowdxh(block, 0.7, Vec3d.ZERO);
    }
 
    /**
     * @mapping {@literal hashed m_kmtowdxh Lnet/minecraft/unmapped/C_sridforj;m_kmtowdxh(Lnet/minecraft/unmapped/C_wzdnszcs;DLnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogbhoqwb;}
-    * @mapping {@literal named getDispensePos Lnet/minecraft/block/dispenser/DispenserBlock;getDispensePos(Lnet/minecraft/util/math/BlockPointer;DLnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Position;}
+    * @mapping {@literal named m_kmtowdxh Lnet/minecraft/block/dispenser/DispenserBlock;m_kmtowdxh(Lnet/minecraft/util/math/BlockPointer;DLnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Position;}
     */
-   public static Position getDispensePos(BlockPointer block, double baseOffsetFactor, Vec3d offset) {
+   public static Position m_kmtowdxh(BlockPointer block, double d, Vec3d arg2) {
       Direction lv = block.state().get(FACING);
       return block.center()
-         .add(
-            baseOffsetFactor * (double)lv.getOffsetX() + offset.getX(),
-            baseOffsetFactor * (double)lv.getOffsetY() + offset.getY(),
-            baseOffsetFactor * (double)lv.getOffsetZ() + offset.getZ()
-         );
+         .add(d * (double)lv.getOffsetX() + arg2.getX(), d * (double)lv.getOffsetY() + arg2.getY(), d * (double)lv.getOffsetZ() + arg2.getZ());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2024-08-07 03:59:24.129182400 +0000
+++ namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2024-08-07 03:58:15.193046477 +0000
@@ -14,10 +14,9 @@
  */
 public class ItemDispenserBehavior implements DispenserBehavior {
    /**
-    * @mapping {@literal hashed f_vkzertet Lnet/minecraft/unmapped/C_dnfsxzwl;f_vkzertet:I}
-    * @mapping {@literal named DEFAULT_SPAWN_VELOCITY_DEVIATION Lnet/minecraft/block/dispenser/ItemDispenserBehavior;DEFAULT_SPAWN_VELOCITY_DEVIATION:I}
+    * Mapping not found
     */
-   private static final int DEFAULT_SPAWN_VELOCITY_DEVIATION = 6;
+   private static final int f_vkzertet = 6;
 
    /**
     * @mapping {@literal hashed dispense Lnet/minecraft/unmapped/C_dnfsxzwl;dispense(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
@@ -37,19 +36,17 @@
     */
    protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
       Direction lv = pointer.state().get(DispenserBlock.FACING);
-      Position lv2 = DispenserBlock.getDispensePos(pointer);
+      Position lv2 = DispenserBlock.m_tfzksanp(pointer);
       ItemStack lv3 = stack.split(1);
       spawnItem(pointer.world(), lv3, 6, lv, lv2);
       return stack;
    }
 
    /**
-    * @param velocityDeviation deviation (in degrees) of the spawned item's velocity
-    * 
     * @mapping {@literal hashed m_zoenssci Lnet/minecraft/unmapped/C_dnfsxzwl;m_zoenssci(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;ILnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_ogbhoqwb;)V}
     * @mapping {@literal named spawnItem Lnet/minecraft/block/dispenser/ItemDispenserBehavior;spawnItem(Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;ILnet/minecraft/util/math/Direction;Lnet/minecraft/util/math/Position;)V}
     */
-   public static void spawnItem(World world, ItemStack stack, int velocityDeviation, Direction side, Position pos) {
+   public static void spawnItem(World world, ItemStack stack, int offset, Direction side, Position pos) {
       double d = pos.getX();
       double e = pos.getY();
       double f = pos.getZ();
@@ -62,9 +59,9 @@
       ItemEntity lv = new ItemEntity(world, d, e, f, stack);
       double g = world.random.nextDouble() * 0.1 + 0.2;
       lv.setVelocity(
-         world.random.nextTriangular((double)side.getOffsetX() * g, 0.0172275 * (double)velocityDeviation),
-         world.random.nextTriangular(0.2, 0.0172275 * (double)velocityDeviation),
-         world.random.nextTriangular((double)side.getOffsetZ() * g, 0.0172275 * (double)velocityDeviation)
+         world.random.nextTriangular((double)side.getOffsetX() * g, 0.0172275 * (double)offset),
+         world.random.nextTriangular(0.2, 0.0172275 * (double)offset),
+         world.random.nextTriangular((double)side.getOffsetZ() * g, 0.0172275 * (double)offset)
       );
       world.spawnEntity(lv);
    }
@@ -82,7 +79,7 @@
     * @mapping {@literal named spawnParticles Lnet/minecraft/block/dispenser/ItemDispenserBehavior;spawnParticles(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/util/math/Direction;)V}
     */
    protected void spawnParticles(BlockPointer pointer, Direction side) {
-      spawnDefaultParticles(pointer, side);
+      m_yfabkxkw(pointer, side);
    }
 
    /**
@@ -95,37 +92,37 @@
 
    /**
     * @mapping {@literal hashed m_yfabkxkw Lnet/minecraft/unmapped/C_dnfsxzwl;m_yfabkxkw(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V}
-    * @mapping {@literal named spawnDefaultParticles Lnet/minecraft/block/dispenser/ItemDispenserBehavior;spawnDefaultParticles(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/util/math/Direction;)V}
+    * @mapping {@literal named m_yfabkxkw Lnet/minecraft/block/dispenser/ItemDispenserBehavior;m_yfabkxkw(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/util/math/Direction;)V}
     */
-   private static void spawnDefaultParticles(BlockPointer block, Direction direction) {
-      block.world().syncWorldEvent(WorldEvents.DISPENSER_FIRED, block.pos(), direction.getId());
+   private static void m_yfabkxkw(BlockPointer pointer, Direction direction) {
+      pointer.world().syncWorldEvent(WorldEvents.DISPENSER_FIRED, pointer.pos(), direction.getId());
    }
 
    /**
     * @mapping {@literal hashed m_hdvxaiaq Lnet/minecraft/unmapped/C_dnfsxzwl;m_hdvxaiaq(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
     * @mapping {@literal named consumeWithRemainder Lnet/minecraft/block/dispenser/ItemDispenserBehavior;consumeWithRemainder(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
     */
-   protected ItemStack consumeWithRemainder(BlockPointer block, ItemStack dispensedStack, ItemStack remainder) {
-      dispensedStack.decrement(1);
-      if (dispensedStack.isEmpty()) {
+   protected ItemStack consumeWithRemainder(BlockPointer pointer, ItemStack stack, ItemStack remainder) {
+      stack.decrement(1);
+      if (stack.isEmpty()) {
          return remainder;
       } else {
-         this.insertAndSpawnExcess(block, remainder);
-         return dispensedStack;
+         this.m_fhxczazc(pointer, remainder);
+         return stack;
       }
    }
 
    /**
     * @mapping {@literal hashed m_fhxczazc Lnet/minecraft/unmapped/C_dnfsxzwl;m_fhxczazc(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-    * @mapping {@literal named insertAndSpawnExcess Lnet/minecraft/block/dispenser/ItemDispenserBehavior;insertAndSpawnExcess(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;)V}
+    * @mapping {@literal named m_fhxczazc Lnet/minecraft/block/dispenser/ItemDispenserBehavior;m_fhxczazc(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;)V}
     */
-   private void insertAndSpawnExcess(BlockPointer block, ItemStack stack) {
-      ItemStack lv = block.blockEntity().tryInsert(stack);
+   private void m_fhxczazc(BlockPointer pointer, ItemStack stack) {
+      ItemStack lv = pointer.blockEntity().m_idqgppgo(stack);
       if (!lv.isEmpty()) {
-         Direction lv2 = block.state().get(DispenserBlock.FACING);
-         spawnItem(block.world(), lv, 6, lv2, DispenserBlock.getDispensePos(block));
-         playDefaultSound(block);
-         spawnDefaultParticles(block, lv2);
+         Direction lv2 = pointer.state().get(DispenserBlock.FACING);
+         spawnItem(pointer.world(), lv, 6, lv2, DispenserBlock.m_tfzksanp(pointer));
+         playDefaultSound(pointer);
+         m_yfabkxkw(pointer, lv2);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2024-08-07 03:59:24.229182597 +0000
+++ namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2024-08-07 03:58:15.313046717 +0000
@@ -31,7 +31,7 @@
          BlockPos lv2 = pointer.pos().offset(pointer.state().get(DispenserBlock.FACING));
          this.setSuccess(tryShearBlock(lv, lv2) || tryShearEntity(lv, lv2));
          if (this.isSuccess()) {
-            stack.damageEquipment(1, lv, null, arg -> {
+            stack.m_hskgqwrk(1, lv, null, arg -> {
             });
          }
       }
diff -bur namedTargetSrc/net/minecraft/block/DropperBlock.java namedSrc/net/minecraft/block/DropperBlock.java
--- namedTargetSrc/net/minecraft/block/DropperBlock.java	2024-08-07 03:59:24.093182329 +0000
+++ namedSrc/net/minecraft/block/DropperBlock.java	2024-08-07 03:58:15.149046390 +0000
@@ -90,7 +90,7 @@
             ItemStack lv3 = lv.getStack(i);
             if (!lv3.isEmpty()) {
                Direction lv4 = world.getBlockState(pos).get(FACING);
-               Inventory lv5 = HopperBlockEntity.findInventory(world, pos.offset(lv4));
+               Inventory lv5 = HopperBlockEntity.getInventoryAt(world, pos.offset(lv4));
                ItemStack lv6;
                if (lv5 == null) {
                   lv6 = BEHAVIOR.dispense(lv2, lv3);
diff -bur namedTargetSrc/net/minecraft/block/EndGatewayBlock.java namedSrc/net/minecraft/block/EndGatewayBlock.java
--- namedTargetSrc/net/minecraft/block/EndGatewayBlock.java	2024-08-07 03:59:24.101182345 +0000
+++ namedSrc/net/minecraft/block/EndGatewayBlock.java	2024-08-07 03:58:15.157046406 +0000
@@ -11,10 +11,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.unmapped.C_teerivzm;
+import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
-import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 import org.jetbrains.annotations.Nullable;
@@ -23,7 +24,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_pwjzqojt}
  * @mapping {@literal named net/minecraft/block/EndGatewayBlock}
  */
-public class EndGatewayBlock extends BlockWithEntity implements Portal {
+public class EndGatewayBlock extends BlockWithEntity implements C_teerivzm {
    /**
     * @mapping {@literal hashed f_lllipcqu Lnet/minecraft/unmapped/C_pwjzqojt;f_lllipcqu:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named CODEC Lnet/minecraft/block/EndGatewayBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
@@ -60,7 +61,7 @@
    @Nullable
    @Override
    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
-      return checkType(type, BlockEntityType.END_GATEWAY, world.isClient ? EndGatewayBlockEntity::clientTick : EndGatewayBlockEntity::serverTick);
+      return checkType(type, BlockEntityType.END_GATEWAY, world.isClient ? EndGatewayBlockEntity::clientTick : EndGatewayBlockEntity::m_ryvrsnee);
    }
 
    /**
@@ -114,36 +115,34 @@
     */
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
-      if (entity.canUsePortals(false)
+      if (entity.m_acybdbgv(false)
          && !world.isClient
          && world.getBlockEntity(pos) instanceof EndGatewayBlockEntity lv2
          && !lv2.needsCooldownBeforeTeleporting()) {
-         entity.setInsidePortal(this, pos);
+         entity.m_bikcqssn(this, pos);
          EndGatewayBlockEntity.startTeleportCooldown(world, pos, state, lv2);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_pwjzqojt;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/EndGatewayBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
     */
    @Nullable
    @Override
-   public DimensionTransition createTransition(ServerWorld world, Entity entity, BlockPos pos) {
+   public C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
       if (world.getBlockEntity(pos) instanceof EndGatewayBlockEntity lv2) {
-         Vec3d lv4 = lv2.createExitPortalIfAbsent(world, pos);
-         return lv4 != null
-            ? new DimensionTransition(world, lv4, getExitVelocity(entity), entity.getYaw(), entity.getPitch(), DimensionTransition.PLACE_PORTAL_CHUNK_TICKET)
-            : null;
+         Vec3d lv4 = lv2.m_shfarbmg(world, pos);
+         return lv4 != null ? new C_zbvyjshu(world, lv4, m_jeehjmdl(arg2), arg2.getYaw(), arg2.getPitch(), C_zbvyjshu.f_fbtpbgjw) : null;
       } else {
          return null;
       }
    }
 
    /**
-    * @mapping {@literal hashed m_jeehjmdl Lnet/minecraft/unmapped/C_pwjzqojt;m_jeehjmdl(Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_vgpupfxx;}
-    * @mapping {@literal named getExitVelocity Lnet/minecraft/block/EndGatewayBlock;getExitVelocity(Lnet/minecraft/entity/Entity;)Lnet/minecraft/util/math/Vec3d;}
+    * Mapping not found
     */
-   private static Vec3d getExitVelocity(Entity entity) {
-      return entity instanceof EnderPearlEntity ? new Vec3d(0.0, -1.0, 0.0) : entity.getVelocity();
+   private static Vec3d m_jeehjmdl(Entity arg) {
+      return arg instanceof EnderPearlEntity ? new Vec3d(0.0, -1.0, 0.0) : arg.getVelocity();
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/EndPortalBlock.java namedSrc/net/minecraft/block/EndPortalBlock.java
--- namedTargetSrc/net/minecraft/block/EndPortalBlock.java	2024-08-07 03:59:24.257182652 +0000
+++ namedSrc/net/minecraft/block/EndPortalBlock.java	2024-08-07 03:58:15.357046805 +0000
@@ -10,6 +10,9 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.unmapped.C_idrtmfxf;
+import net.minecraft.unmapped.C_teerivzm;
+import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.function.BooleanBiFunction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -18,16 +21,14 @@
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
-import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
-import net.minecraft.world.gen.feature.EndPlatformFeature;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_iqbzlnao}
  * @mapping {@literal named net/minecraft/block/EndPortalBlock}
  */
-public class EndPortalBlock extends BlockWithEntity implements Portal {
+public class EndPortalBlock extends BlockWithEntity implements C_teerivzm {
    /**
     * @mapping {@literal hashed f_woptqwkp Lnet/minecraft/unmapped/C_iqbzlnao;f_woptqwkp:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named CODEC Lnet/minecraft/block/EndPortalBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
@@ -76,7 +77,7 @@
     */
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
-      if (entity.canUsePortals(false)
+      if (entity.m_acybdbgv(false)
          && VoxelShapes.matchesAnywhere(
             VoxelShapes.cuboid(entity.getBounds().offset((double)(-pos.getX()), (double)(-pos.getY()), (double)(-pos.getZ()))),
             state.getOutlineShape(world, pos),
@@ -87,15 +88,16 @@
             return;
          }
 
-         entity.setInsidePortal(this, pos);
+         entity.m_bikcqssn(this, pos);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_iqbzlnao;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/EndPortalBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
     */
    @Override
-   public DimensionTransition createTransition(ServerWorld world, Entity entity, BlockPos pos) {
+   public C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.END ? World.OVERWORLD : World.END;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -103,25 +105,23 @@
       } else {
          boolean bl = lv == World.END;
          BlockPos lv3 = bl ? ServerWorld.END_SPAWN_POS : lv2.getSpawnPos();
-         Vec3d lv4 = lv3.ofBottomCenter();
-         float f = entity.getYaw();
+         Vec3d lv4 = lv3.m_rtputfdg();
+         float f = arg2.getYaw();
          if (bl) {
-            EndPlatformFeature.place(lv2, BlockPos.fromPosition(lv4).down(), true);
+            C_idrtmfxf.m_narefewt(lv2, BlockPos.fromPosition(lv4).down(), true);
             f = Direction.WEST.asRotation();
-            if (entity instanceof ServerPlayerEntity) {
+            if (arg2 instanceof ServerPlayerEntity) {
                lv4 = lv4.subtract(0.0, 1.0, 0.0);
             }
          } else {
-            if (entity instanceof ServerPlayerEntity lv5) {
-               return lv5.m_jpjsvuqt(false, DimensionTransition.NO_OP);
+            if (arg2 instanceof ServerPlayerEntity lv5) {
+               return lv5.m_jpjsvuqt(false, C_zbvyjshu.f_jgwyllbi);
             }
 
-            lv4 = entity.getAdjustedSpawnLocation(lv2, lv3).ofBottomCenter();
+            lv4 = arg2.m_vfbpgxfo(lv2, lv3).m_rtputfdg();
          }
 
-         return new DimensionTransition(
-            lv2, lv4, entity.getVelocity(), f, entity.getPitch(), DimensionTransition.PLAY_PORTAL_SOUND.then(DimensionTransition.PLACE_PORTAL_CHUNK_TICKET)
-         );
+         return new C_zbvyjshu(lv2, lv4, arg2.getVelocity(), f, arg2.getPitch(), C_zbvyjshu.f_kidpbkzf.then(C_zbvyjshu.f_fbtpbgjw));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-08-07 03:59:24.165182470 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-08-07 03:58:15.237046565 +0000
@@ -21,7 +21,6 @@
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.recipe.AbstractCookingRecipe;
-import net.minecraft.recipe.CraftingHandler;
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.recipe.RecipeInputProvider;
 import net.minecraft.recipe.RecipeManager;
@@ -37,6 +36,7 @@
 import net.minecraft.screen.PropertyDelegate;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.unmapped.C_mudajugr;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.collection.DefaultedList;
@@ -51,7 +51,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_dlxbwxyf}
  * @mapping {@literal named net/minecraft/block/entity/AbstractFurnaceBlockEntity}
  */
-public abstract class AbstractFurnaceBlockEntity extends LockableContainerBlockEntity implements SidedInventory, CraftingHandler, RecipeInputProvider {
+public abstract class AbstractFurnaceBlockEntity extends LockableContainerBlockEntity implements SidedInventory, C_mudajugr, RecipeInputProvider {
    /**
     * @mapping {@literal hashed f_ruznenwn Lnet/minecraft/unmapped/C_dlxbwxyf;f_ruznenwn:I}
     * @mapping {@literal named INPUT_SLOT Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;INPUT_SLOT:I}
@@ -358,15 +358,15 @@
     * Mapping not found
     */
    @Override
-   protected void readNbtImpl(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
-      super.readNbtImpl(nbt, lookupProvider);
+   protected void m_trzmaydr(NbtCompound arg, HolderLookup.Provider arg2) {
+      super.m_trzmaydr(arg, arg2);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      Inventories.readNbt(nbt, this.inventory, lookupProvider);
-      this.burnTime = nbt.getShort("BurnTime");
-      this.cookTime = nbt.getShort("CookTime");
-      this.cookTimeTotal = nbt.getShort("CookTimeTotal");
+      Inventories.readNbt(arg, this.inventory, arg2);
+      this.burnTime = arg.getShort("BurnTime");
+      this.cookTime = arg.getShort("CookTime");
+      this.cookTimeTotal = arg.getShort("CookTimeTotal");
       this.fuelTime = this.getFuelTime(this.inventory.get(1));
-      NbtCompound lv = nbt.getCompound("RecipesUsed");
+      NbtCompound lv = arg.getCompound("RecipesUsed");
 
       for (String string : lv.getKeys()) {
          this.recipesUsed.put(Identifier.parse(string), lv.getInt(string));
@@ -434,7 +434,7 @@
                blockEntity.cookTime = 0;
                blockEntity.cookTimeTotal = getCookTime(world, blockEntity);
                if (craftRecipe(world.getRegistryManager(), lv3, blockEntity.inventory, i)) {
-                  blockEntity.onResultUpdate(lv3);
+                  blockEntity.m_shzndkyk(lv3);
                }
 
                bl2 = true;
@@ -579,7 +579,7 @@
     * Mapping not found
     */
    @Override
-   protected DefaultedList<ItemStack> getInventory() {
+   protected DefaultedList<ItemStack> getStacks() {
       return this.inventory;
    }
 
@@ -587,8 +587,8 @@
     * Mapping not found
     */
    @Override
-   protected void setInventory(DefaultedList<ItemStack> stacks) {
-      this.inventory = stacks;
+   protected void m_nnlaacjo(DefaultedList<ItemStack> arg) {
+      this.inventory = arg;
    }
 
    /**
@@ -626,9 +626,9 @@
     * Mapping not found
     */
    @Override
-   public void onResultUpdate(@Nullable RecipeHolder<?> recipe) {
-      if (recipe != null) {
-         Identifier lv = recipe.id();
+   public void m_shzndkyk(@Nullable RecipeHolder<?> arg) {
+      if (arg != null) {
+         Identifier lv = arg.id();
          this.recipesUsed.addTo(lv, 1);
       }
    }
@@ -638,15 +638,16 @@
     */
    @Nullable
    @Override
-   public RecipeHolder<?> getLastRecipe() {
+   public RecipeHolder<?> m_qdwxuhpk() {
       return null;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qysvzsry Lnet/minecraft/unmapped/C_dlxbwxyf;m_qysvzsry(Lnet/minecraft/unmapped/C_jzrpycqo;Ljava/util/List;)V}
+    * @mapping {@literal named m_qysvzsry Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;m_qysvzsry(Lnet/minecraft/entity/player/PlayerEntity;Ljava/util/List;)V}
     */
    @Override
-   public void unlockLastRecipe(PlayerEntity player, List<ItemStack> ingredients) {
+   public void m_qysvzsry(PlayerEntity player, List<ItemStack> list) {
    }
 
    /**
@@ -674,9 +675,9 @@
       List<RecipeHolder<?>> list = Lists.<RecipeHolder<?>>newArrayList();
 
       for (Entry<Identifier> entry : this.recipesUsed.object2IntEntrySet()) {
-         world.getRecipeManager().get((Identifier)entry.getKey()).ifPresent(recipe -> {
-            list.add(recipe);
-            dropExperience(world, pos, entry.getIntValue(), ((AbstractCookingRecipe)recipe.value()).getExperience());
+         world.getRecipeManager().get((Identifier)entry.getKey()).ifPresent(arg3 -> {
+            list.add(arg3);
+            dropExperience(world, pos, entry.getIntValue(), ((AbstractCookingRecipe)arg3.value()).getExperience());
          });
       }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java namedSrc/net/minecraft/block/entity/BannerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-08-07 03:59:24.233182605 +0000
+++ namedSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-08-07 03:58:15.317046726 +0000
@@ -77,11 +77,11 @@
 
    /**
     * @mapping {@literal hashed m_igihlswz Lnet/minecraft/unmapped/C_mwamopji;m_igihlswz(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_arllgqae;)V}
-    * @mapping {@literal named applyComponentsAndColor Lnet/minecraft/block/entity/BannerBlockEntity;applyComponentsAndColor(Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/DyeColor;)V}
+    * @mapping {@literal named m_igihlswz Lnet/minecraft/block/entity/BannerBlockEntity;m_igihlswz(Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/DyeColor;)V}
     */
-   public void applyComponentsAndColor(ItemStack stack, DyeColor baseColor) {
+   public void m_igihlswz(ItemStack stack, DyeColor baseColor) {
       this.baseColor = baseColor;
-      this.applyComponents(stack);
+      this.m_rloeylgt(stack);
    }
 
    /**
@@ -120,17 +120,17 @@
     * Mapping not found
     */
    @Override
-   protected void readNbtImpl(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
-      super.readNbtImpl(nbt, lookupProvider);
-      if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = tryParseCustomName(nbt.getString("CustomName"), lookupProvider);
+   protected void m_trzmaydr(NbtCompound arg, HolderLookup.Provider arg2) {
+      super.m_trzmaydr(arg, arg2);
+      if (arg.contains("CustomName", NbtElement.STRING_TYPE)) {
+         this.customName = m_ijpcosft(arg.getString("CustomName"), arg2);
       }
 
-      if (nbt.contains("patterns")) {
+      if (arg.contains("patterns")) {
          BannerPatternsComponent.CODEC
-            .parse(lookupProvider.createSerializationContext(NbtOps.INSTANCE), nbt.get("patterns"))
-            .resultOrPartial(message -> LOGGER.error("Failed to parse banner patterns: '{}'", message))
-            .ifPresent(patterns -> this.patterns = patterns);
+            .parse(arg2.createSerializationContext(NbtOps.INSTANCE), arg.get("patterns"))
+            .resultOrPartial(string -> LOGGER.error("Failed to parse banner patterns: '{}'", string))
+            .ifPresent(argx -> this.patterns = argx);
       }
    }
 
@@ -151,10 +151,9 @@
    }
 
    /**
-    * @mapping {@literal hashed m_kmayejyb Lnet/minecraft/unmapped/C_mwamopji;m_kmayejyb()Lnet/minecraft/unmapped/C_wwbphpbp;}
-    * @mapping {@literal named getPatterns Lnet/minecraft/block/entity/BannerBlockEntity;getPatterns()Lnet/minecraft/component/type/BannerPatternsComponent;}
+    * Mapping not found
     */
-   public BannerPatternsComponent getPatterns() {
+   public BannerPatternsComponent m_kmayejyb() {
       return this.patterns;
    }
 
@@ -164,7 +163,7 @@
     */
    public ItemStack getPickStack() {
       ItemStack lv = new ItemStack(BannerBlock.getForColor(this.baseColor));
-      lv.applyComponents(this.copyComponents());
+      lv.applyComponents(this.m_jhcvwprs());
       return lv;
    }
 
@@ -180,28 +179,28 @@
     * Mapping not found
     */
    @Override
-   protected void readComponents(BlockEntity.ComponentAccess access) {
-      super.readComponents(access);
-      this.patterns = access.getOrDefault(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
-      this.customName = access.get(DataComponentTypes.CUSTOM_NAME);
+   protected void m_cckjpvhm(BlockEntity.C_uyhxhbrv arg) {
+      super.m_cckjpvhm(arg);
+      this.patterns = arg.m_uwrxlczq(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
+      this.customName = arg.m_gotgrppy(DataComponentTypes.CUSTOM_NAME);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   protected void addComponents(DataComponentMap.Builder builder) {
-      super.addComponents(builder);
-      builder.put(DataComponentTypes.BANNER_PATTERNS, this.patterns);
-      builder.put(DataComponentTypes.CUSTOM_NAME, this.customName);
+   protected void m_apmtvpji(DataComponentMap.Builder arg) {
+      super.m_apmtvpji(arg);
+      arg.put(DataComponentTypes.BANNER_PATTERNS, this.patterns);
+      arg.put(DataComponentTypes.CUSTOM_NAME, this.customName);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void removeComponentData(NbtCompound nbt) {
-      nbt.remove("patterns");
-      nbt.remove("CustomName");
+   public void m_pcgjfrqh(NbtCompound arg) {
+      arg.remove("patterns");
+      arg.remove("CustomName");
    }
 }


The remaining diff is too long!

Please sign in to comment.