Skip to content

Commit

Permalink
some mappings for worldrenderer (#619)
Browse files Browse the repository at this point in the history 
* some mappings for worldrenderer and one picomapping for chunkbuilder

* chunkbuilder was misleading apparently

* Update mappings/net/minecraft/client/render/WorldRenderer.mapping

Co-authored-by: Eli Orona <[email protected]>

* Update mappings/net/minecraft/client/render/WorldRenderer.mapping

Co-authored-by: Eli Orona <[email protected]>

* Apply suggestions from code review

* some more mappings i guess

* some more mappings i guess

* Update mappings/net/minecraft/client/render/WorldRenderer.mapping

Co-authored-by: Eli Orona <[email protected]>

* Update mappings/net/minecraft/util/math/MathHelper.mapping

Co-authored-by: Eli Orona <[email protected]>

---------

Co-authored-by: Eli Orona <[email protected]>
  • Loading branch information
@woodiertexas @OroArmor
woodiertexas and OroArmor authored Aug 1, 2024
1 parent 71d7aed commit 24ea1b0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
21 changes: 18 additions & 3 deletions mappings/net/minecraft/client/render/WorldRenderer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRenderer
FIELD f_agpxpcxm SUN Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_cboyeijz cameraChunkZ I
FIELD f_cdatnkps END_SKY Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_cnqiydim transparencyShader Lnet/minecraft/unmapped/C_pdhhdxwe;
FIELD f_crrssrby lightSkyBuffer Lnet/minecraft/unmapped/C_lhjdxjis;
Expand All @@ -14,6 +15,7 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
FIELD f_gcyanlsp lastCameraY D
FIELD f_gepidnwk blockEntityCount I
FIELD f_gnmkbmxx lastCameraZ D
FIELD f_gqcuibba chunkBuilder Lnet/minecraft/unmapped/C_sjynkhfr;
FIELD f_hgjgxstw lastCameraX D
FIELD f_ivihlszs SNOW Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_izxsabgg MOON_PHASES Lnet/minecraft/unmapped/C_ncpywfca;
Expand All @@ -30,6 +32,7 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
FIELD f_ntktcmew rainSizeX [F
FIELD f_ntzttglo TRANSPARENT_SORT_AMOUNT I
FIELD f_ofkpyvlk DIRECTIONS [Lnet/minecraft/unmapped/C_xpuuihxf;
FIELD f_oppequxe currentSounds Ljava/util/Map;
FIELD f_ouqnhuws starsBuffer Lnet/minecraft/unmapped/C_lhjdxjis;
FIELD f_pgcyttka entityFramebuffer Lnet/minecraft/unmapped/C_xxwgvelc;
FIELD f_psrqwipd lastCloudsBlockZ I
Expand All @@ -54,6 +57,8 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
FIELD f_yievaftc RAIN Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_yikkuozy viewDistance I
FIELD f_ypfzydqz translucentFramebuffer Lnet/minecraft/unmapped/C_xxwgvelc;
FIELD f_yvsvzxdd cameraChunkY I
FIELD f_yzkmvnyb cameraChunkX I
FIELD f_yznrgjts SKY_RADIUS F
FIELD f_yzwscawv FORCEFIELD Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_zdbvvrzp cloudsBuffer Lnet/minecraft/unmapped/C_lhjdxjis;
Expand Down Expand Up @@ -239,11 +244,14 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
METHOD m_kgpnuhyu getEntityFramebuffer ()Lnet/minecraft/unmapped/C_xxwgvelc;
METHOD m_khytiwdn setupFrustum (Lnet/minecraft/unmapped/C_vgpupfxx;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V
ARG 1 pos
ARG 2 projectionMatrix
ARG 2 modelViewMatrix
ARG 3 projectionMatrix
METHOD m_kkvlftbz addVertexFromFrustum (Lnet/minecraft/unmapped/C_igthdzux;Lorg/joml/Matrix4f;I)V
ARG 1 consumer
ARG 2 matrix
ARG 3 frustumIndex
METHOD m_kvtxvfgf createParticles (ILnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_lwmufxcy;)V
ARG 4 particle
METHOD m_lmslduiw addParticle (Lnet/minecraft/unmapped/C_nqucohct;ZZDDDDDD)V
ARG 1 parameters
ARG 2 shouldAlwaysSpawn
Expand All @@ -269,11 +277,14 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
ARG 3 camera
ARG 4 gameRenderer
ARG 5 lightmapTextureManager
ARG 6 projectionMatrix
ARG 6 modelViewMatrix
ARG 7 projectionMatrix
METHOD m_ntxphbrg getLightmapCoordinates (Lnet/minecraft/unmapped/C_xjeuupup;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)I
ARG 0 world
ARG 1 state
ARG 2 pos
METHOD m_obdmlaer (Lnet/minecraft/unmapped/C_igrgeffe$C_insrqxjm;Lnet/minecraft/unmapped/C_igthdzux;Lnet/minecraft/unmapped/C_tizlwnnv;)Lnet/minecraft/unmapped/C_igthdzux;
ARG 2 renderLayer
METHOD m_ognnlhul addChainedFilledBoxVertices (Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igthdzux;DDDDDDFFFF)V
ARG 0 matrices
ARG 1 vertexConsumer
Expand All @@ -295,6 +306,7 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
ARG 5 maxY
ARG 6 maxZ
METHOD m_owgocfxp createSkyBuffer (Lnet/minecraft/unmapped/C_hiiunyvh;F)Lnet/minecraft/unmapped/C_fpcijbbg;
ARG 0 tessellator
ARG 1 y
METHOD m_qgbrxqob setBlockBreakingInfo (ILnet/minecraft/unmapped/C_hynzadkk;I)V
ARG 1 entityId
Expand All @@ -304,7 +316,8 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
METHOD m_qwohxtzw renderWorldBorder (Lnet/minecraft/unmapped/C_dcmtgrvm;)V
ARG 1 camera
METHOD m_qwqxlbnd renderSky (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/unmapped/C_dcmtgrvm;ZLjava/lang/Runnable;)V
ARG 1 projectionMatrix
ARG 1 modelViewMatrix
ARG 2 projectionMatrix
ARG 3 tickDelta
ARG 4 preStep
ARG 5 skipRendering
Expand All @@ -319,6 +332,7 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
ARG 9 matrices
ARG 10 vertexConsumers
METHOD m_rlcfnbww renderStars (Lnet/minecraft/unmapped/C_hiiunyvh;)Lnet/minecraft/unmapped/C_fpcijbbg;
ARG 1 tessellator
METHOD m_roxvmdfn getViewDistance ()D
METHOD m_rwjohyib scheduleBlockRerenderIfNeeded (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;)V
ARG 1 pos
Expand Down Expand Up @@ -405,6 +419,7 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
ARG 4 y
ARG 6 z
ARG 8 color
METHOD m_znnjtopn getChunkBuilderDebugString ()Ljava/lang/String;
METHOD m_zvzvgwmw captureFrustum (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;DDDLnet/minecraft/unmapped/C_jwzjqevg;)V
ARG 1 positionMatrix
ARG 2 projectionMatrix
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_sjynkhfr net/minecraft/client/render/chunk/ChunkBuilder
FIELD f_losuuhkx currentLinkedQueue Ljava/util/Queue;
1 change: 1 addition & 0 deletions mappings/net/minecraft/util/math/MathHelper.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ CLASS net/minecraft/unmapped/C_zpccxxiz net/minecraft/util/math/MathHelper
METHOD m_rzxxkxfg lengthSquared (DD)D
ARG 0 a
ARG 2 b
METHOD m_saszmoqp lengthSquared (FFF)F
METHOD m_shkxmddf ([F)V
ARG 0 sineTable
METHOD m_snsjabxg abs (I)I
Expand Down

1 comment on commit 24ea1b0

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit 24ea1b0, 6 file(s) were updated with 144 line(s) added and 132 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-08-01 19:09:20.587509213 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-08-01 19:08:12.178240811 +0000
@@ -381,7 +381,7 @@
                + ")",
             this.client.fpsDebugString,
             string5,
-            this.client.worldRenderer.m_znnjtopn(),
+            this.client.worldRenderer.getChunkBuilderDebugString(),
             this.client.worldRenderer.getEntitiesDebugString(),
             "P: " + this.client.particleManager.getDebugString() + ". T: " + this.client.world.getRegularEntityCount(),
             this.client.world.asString(),
@@ -418,7 +418,7 @@
                + ")",
             this.client.fpsDebugString,
             string5,
-            this.client.worldRenderer.m_znnjtopn(),
+            this.client.worldRenderer.getChunkBuilderDebugString(),
             this.client.worldRenderer.getEntitiesDebugString(),
             "P: " + this.client.particleManager.getDebugString() + ". T: " + this.client.world.getRegularEntityCount(),
             this.client.world.asString()
diff -bur namedTargetSrc/net/minecraft/client/render/BuiltChunkStorage.java namedSrc/net/minecraft/client/render/BuiltChunkStorage.java
--- namedTargetSrc/net/minecraft/client/render/BuiltChunkStorage.java	2024-08-01 19:09:20.555508614 +0000
+++ namedSrc/net/minecraft/client/render/BuiltChunkStorage.java	2024-08-01 19:08:12.174240738 +0000
@@ -3,7 +3,7 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.unmapped.C_sjynkhfr;
+import net.minecraft.client.render.chunk.ChunkBuilder;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.HeightLimitView;
@@ -49,13 +49,13 @@
    /**
     * Mapping not found
     */
-   public C_sjynkhfr.C_exmylrbc[] f_llzkkcwf;
+   public ChunkBuilder.C_exmylrbc[] f_llzkkcwf;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rqhfsngs;<init>(Lnet/minecraft/unmapped/C_sjynkhfr;Lnet/minecraft/unmapped/C_cdctfzbn;ILnet/minecraft/unmapped/C_sfkkabhx;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/render/BuiltChunkStorage;<init>(Lnet/minecraft/unmapped/C_sjynkhfr;Lnet/minecraft/world/World;ILnet/minecraft/client/render/WorldRenderer;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/render/BuiltChunkStorage;<init>(Lnet/minecraft/client/render/chunk/ChunkBuilder;Lnet/minecraft/world/World;ILnet/minecraft/client/render/WorldRenderer;)V}
     */
-   public BuiltChunkStorage(C_sjynkhfr arg, World world, int viewDistance, WorldRenderer worldRenderer) {
+   public BuiltChunkStorage(ChunkBuilder arg, World world, int viewDistance, WorldRenderer worldRenderer) {
       this.worldRenderer = worldRenderer;
       this.world = world;
       this.setViewDistance(viewDistance);
@@ -64,14 +64,14 @@
 
    /**
     * @mapping {@literal hashed m_paxdewur Lnet/minecraft/unmapped/C_rqhfsngs;m_paxdewur(Lnet/minecraft/unmapped/C_sjynkhfr;)V}
-    * @mapping {@literal named createSections Lnet/minecraft/client/render/BuiltChunkStorage;createSections(Lnet/minecraft/unmapped/C_sjynkhfr;)V}
+    * @mapping {@literal named createSections Lnet/minecraft/client/render/BuiltChunkStorage;createSections(Lnet/minecraft/client/render/chunk/ChunkBuilder;)V}
     */
-   protected void createSections(C_sjynkhfr arg) {
+   protected void createSections(ChunkBuilder arg) {
       if (!MinecraftClient.getInstance().isOnThread()) {
          throw new IllegalStateException("createSections called from wrong thread: " + Thread.currentThread().getName());
       } else {
          int i = this.xGridSections * this.yGridSections * this.zGridSections;
-         this.f_llzkkcwf = new C_sjynkhfr.C_exmylrbc[i];
+         this.f_llzkkcwf = new ChunkBuilder.C_exmylrbc[i];
 
          for (int j = 0; j < this.xGridSections; j++) {
             for (int k = 0; k < this.yGridSections; k++) {
@@ -89,7 +89,7 @@
     * @mapping {@literal named clear Lnet/minecraft/client/render/BuiltChunkStorage;clear()V}
     */
    public void clear() {
-      for (C_sjynkhfr.C_exmylrbc lv : this.f_llzkkcwf) {
+      for (ChunkBuilder.C_exmylrbc lv : this.f_llzkkcwf) {
          lv.m_ntorupzd();
       }
    }
@@ -150,7 +150,7 @@
 
             for (int s = 0; s < this.yGridSections; s++) {
                int t = this.world.getBottomY() + s * 16;
-               C_sjynkhfr.C_exmylrbc lv = this.f_llzkkcwf[this.index(k, s, o)];
+               ChunkBuilder.C_exmylrbc lv = this.f_llzkkcwf[this.index(k, s, o)];
                BlockPos lv2 = lv.m_apvthafb();
                if (n != lv2.getX() || t != lv2.getY() || r != lv2.getZ()) {
                   lv.m_ltblhvsd(n, t, r);
@@ -168,16 +168,16 @@
       int l = Math.floorMod(x, this.xGridSections);
       int m = Math.floorMod(y - this.world.getBottomSectionCoord(), this.yGridSections);
       int n = Math.floorMod(z, this.zGridSections);
-      C_sjynkhfr.C_exmylrbc lv = this.f_llzkkcwf[this.index(l, m, n)];
+      ChunkBuilder.C_exmylrbc lv = this.f_llzkkcwf[this.index(l, m, n)];
       lv.m_ggtdhlyn(important);
    }
 
    /**
     * @mapping {@literal hashed m_jpnxgjcl Lnet/minecraft/unmapped/C_rqhfsngs;m_jpnxgjcl(Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;}
-    * @mapping {@literal named m_jpnxgjcl Lnet/minecraft/client/render/BuiltChunkStorage;m_jpnxgjcl(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;}
+    * @mapping {@literal named m_jpnxgjcl Lnet/minecraft/client/render/BuiltChunkStorage;m_jpnxgjcl(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/client/render/chunk/ChunkBuilder$C_exmylrbc;}
     */
    @Nullable
-   protected C_sjynkhfr.C_exmylrbc m_jpnxgjcl(BlockPos pos) {
+   protected ChunkBuilder.C_exmylrbc m_jpnxgjcl(BlockPos pos) {
       int i = MathHelper.floorDiv(pos.getY() - this.world.getBottomY(), 16);
       if (i >= 0 && i < this.yGridSections) {
          int j = MathHelper.floorMod(MathHelper.floorDiv(pos.getX(), 16), this.xGridSections);
Only in namedSrc/net/minecraft/client/render/chunk: ChunkBuilder.java
diff -bur namedTargetSrc/net/minecraft/client/render/WorldRenderer.java namedSrc/net/minecraft/client/render/WorldRenderer.java
--- namedTargetSrc/net/minecraft/client/render/WorldRenderer.java	2024-08-01 19:09:20.387505472 +0000
+++ namedSrc/net/minecraft/client/render/WorldRenderer.java	2024-08-01 19:08:11.898235665 +0000
@@ -60,6 +60,7 @@
 import net.minecraft.client.option.ParticlesMode;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
+import net.minecraft.client.render.chunk.ChunkBuilder;
 import net.minecraft.client.render.chunk.ChunkRenderRegionCache;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.model.ModelLoader;
@@ -97,7 +98,6 @@
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_jnliocmw;
-import net.minecraft.unmapped.C_sjynkhfr;
 import net.minecraft.unmapped.C_yeazlrrn;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -259,7 +259,7 @@
    /**
     * Mapping not found
     */
-   private final ObjectArrayList<C_sjynkhfr.C_exmylrbc> f_qdsyfzmo = new ObjectArrayList<>(10000);
+   private final ObjectArrayList<ChunkBuilder.C_exmylrbc> f_qdsyfzmo = new ObjectArrayList<>(10000);
    /**
     * @mapping {@literal hashed f_uhhggclp Lnet/minecraft/unmapped/C_sfkkabhx;f_uhhggclp:Ljava/util/Set;}
     * @mapping {@literal named noCullingBlockEntities Lnet/minecraft/client/render/WorldRenderer;noCullingBlockEntities:Ljava/util/Set;}
@@ -321,9 +321,10 @@
     */
    private final Long2ObjectMap<SortedSet<BlockBreakingInfo>> blockBreakingProgressions = new Long2ObjectOpenHashMap<>();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_oppequxe Lnet/minecraft/unmapped/C_sfkkabhx;f_oppequxe:Ljava/util/Map;}
+    * @mapping {@literal named currentSounds Lnet/minecraft/client/render/WorldRenderer;currentSounds:Ljava/util/Map;}
     */
-   private final Map<BlockPos, SoundInstance> f_oppequxe = Maps.<BlockPos, SoundInstance>newHashMap();
+   private final Map<BlockPos, SoundInstance> currentSounds = Maps.<BlockPos, SoundInstance>newHashMap();
    /**
     * @mapping {@literal hashed f_fkfkkpvn Lnet/minecraft/unmapped/C_sfkkabhx;f_fkfkkpvn:Lnet/minecraft/unmapped/C_xxwgvelc;}
     * @mapping {@literal named entityOutlinesFramebuffer Lnet/minecraft/client/render/WorldRenderer;entityOutlinesFramebuffer:Lcom/mojang/blaze3d/framebuffer/Framebuffer;}
@@ -373,17 +374,20 @@
    @Nullable
    private ShaderEffect transparencyShader;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yzkmvnyb Lnet/minecraft/unmapped/C_sfkkabhx;f_yzkmvnyb:I}
+    * @mapping {@literal named cameraChunkX Lnet/minecraft/client/render/WorldRenderer;cameraChunkX:I}
     */
-   private int f_yzkmvnyb = Integer.MIN_VALUE;
+   private int cameraChunkX = Integer.MIN_VALUE;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yvsvzxdd Lnet/minecraft/unmapped/C_sfkkabhx;f_yvsvzxdd:I}
+    * @mapping {@literal named cameraChunkY Lnet/minecraft/client/render/WorldRenderer;cameraChunkY:I}
     */
-   private int f_yvsvzxdd = Integer.MIN_VALUE;
+   private int cameraChunkY = Integer.MIN_VALUE;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cboyeijz Lnet/minecraft/unmapped/C_sfkkabhx;f_cboyeijz:I}
+    * @mapping {@literal named cameraChunkZ Lnet/minecraft/client/render/WorldRenderer;cameraChunkZ:I}
     */
-   private int f_cboyeijz = Integer.MIN_VALUE;
+   private int cameraChunkZ = Integer.MIN_VALUE;
    /**
     * @mapping {@literal hashed f_hgjgxstw Lnet/minecraft/unmapped/C_sfkkabhx;f_hgjgxstw:D}
     * @mapping {@literal named lastCameraX Lnet/minecraft/client/render/WorldRenderer;lastCameraX:D}
@@ -436,10 +440,11 @@
    @Nullable
    private CloudRenderMode lastCloudsRenderMode;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_gqcuibba Lnet/minecraft/unmapped/C_sfkkabhx;f_gqcuibba:Lnet/minecraft/unmapped/C_sjynkhfr;}
+    * @mapping {@literal named chunkBuilder Lnet/minecraft/client/render/WorldRenderer;chunkBuilder:Lnet/minecraft/client/render/chunk/ChunkBuilder;}
     */
    @Nullable
-   private C_sjynkhfr f_gqcuibba;
+   private ChunkBuilder chunkBuilder;
    /**
     * @mapping {@literal hashed f_yikkuozy Lnet/minecraft/unmapped/C_sfkkabhx;f_yikkuozy:I}
     * @mapping {@literal named viewDistance Lnet/minecraft/client/render/WorldRenderer;viewDistance:I}
@@ -924,10 +929,10 @@
     * @mapping {@literal hashed m_owgocfxp Lnet/minecraft/unmapped/C_sfkkabhx;m_owgocfxp(Lnet/minecraft/unmapped/C_hiiunyvh;F)Lnet/minecraft/unmapped/C_fpcijbbg;}
     * @mapping {@literal named createSkyBuffer Lnet/minecraft/client/render/WorldRenderer;createSkyBuffer(Lcom/mojang/blaze3d/vertex/Tessellator;F)Lcom/mojang/blaze3d/vertex/BuiltBuffer;}
     */
-   private static BuiltBuffer createSkyBuffer(Tessellator arg, float y) {
+   private static BuiltBuffer createSkyBuffer(Tessellator tessellator, float y) {
       float g = Math.signum(y) * 512.0F;
       float h = 512.0F;
-      BufferBuilder lv = arg.begin(VertexFormat.DrawMode.TRIANGLE_FAN, VertexFormats.POSITION);
+      BufferBuilder lv = tessellator.begin(VertexFormat.DrawMode.TRIANGLE_FAN, VertexFormats.POSITION);
       lv.xyz(0.0F, y, 0.0F);
 
       for (int i = -180; i <= 180; i += 45) {
@@ -956,18 +961,18 @@
     * @mapping {@literal hashed m_rlcfnbww Lnet/minecraft/unmapped/C_sfkkabhx;m_rlcfnbww(Lnet/minecraft/unmapped/C_hiiunyvh;)Lnet/minecraft/unmapped/C_fpcijbbg;}
     * @mapping {@literal named renderStars Lnet/minecraft/client/render/WorldRenderer;renderStars(Lcom/mojang/blaze3d/vertex/Tessellator;)Lcom/mojang/blaze3d/vertex/BuiltBuffer;}
     */
-   private BuiltBuffer renderStars(Tessellator arg) {
+   private BuiltBuffer renderStars(Tessellator tessellator) {
       RandomGenerator lv = RandomGenerator.createLegacy(10842L);
       int i = 1500;
       float f = 100.0F;
-      BufferBuilder lv2 = arg.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION);
+      BufferBuilder lv2 = tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION);
 
       for (int j = 0; j < 1500; j++) {
          float g = lv.nextFloat() * 2.0F - 1.0F;
          float h = lv.nextFloat() * 2.0F - 1.0F;
          float k = lv.nextFloat() * 2.0F - 1.0F;
          float l = 0.15F + lv.nextFloat() * 0.1F;
-         float m = MathHelper.m_saszmoqp(g, h, k);
+         float m = MathHelper.lengthSquared(g, h, k);
          if (!(m <= 0.010000001F) && !(m >= 1.0F)) {
             Vector3f vector3f = new Vector3f(g, h, k).normalize(100.0F);
             float n = (float)(lv.nextDouble() * (float) Math.PI * 2.0);
@@ -987,9 +992,9 @@
     * @mapping {@literal named setWorld Lnet/minecraft/client/render/WorldRenderer;setWorld(Lnet/minecraft/client/world/ClientWorld;)V}
     */
    public void setWorld(@Nullable ClientWorld world) {
-      this.f_yzkmvnyb = Integer.MIN_VALUE;
-      this.f_yvsvzxdd = Integer.MIN_VALUE;
-      this.f_cboyeijz = Integer.MIN_VALUE;
+      this.cameraChunkX = Integer.MIN_VALUE;
+      this.cameraChunkY = Integer.MIN_VALUE;
+      this.cameraChunkZ = Integer.MIN_VALUE;
       this.entityRenderDispatcher.setWorld(world);
       this.world = world;
       if (world != null) {
@@ -1000,11 +1005,11 @@
             this.chunks = null;
          }
 
-         if (this.f_gqcuibba != null) {
-            this.f_gqcuibba.m_ajxgsyha();
+         if (this.chunkBuilder != null) {
+            this.chunkBuilder.m_ajxgsyha();
          }
 
-         this.f_gqcuibba = null;
+         this.chunkBuilder = null;
          this.noCullingBlockEntities.clear();
          this.f_kfsuutjj.m_kkoyotno(null);
          this.f_qdsyfzmo.clear();
@@ -1031,8 +1036,8 @@
       if (this.world != null) {
          this.reloadTransparencyShader();
          this.world.reloadColor();
-         if (this.f_gqcuibba == null) {
-            this.f_gqcuibba = new C_sjynkhfr(
+         if (this.chunkBuilder == null) {
+            this.chunkBuilder = new ChunkBuilder(
                this.world,
                this,
                Util.getMainWorkerExecutor(),
@@ -1041,7 +1046,7 @@
                this.client.getBlockEntityRenderDispatcher()
             );
          } else {
-            this.f_gqcuibba.m_oqvvuilz(this.world);
+            this.chunkBuilder.m_oqvvuilz(this.world);
          }
 
          this.cloudsDirty = true;
@@ -1051,12 +1056,12 @@
             this.chunks.clear();
          }
 
-         this.f_gqcuibba.m_vpmiiwpk();
+         this.chunkBuilder.m_vpmiiwpk();
          synchronized (this.noCullingBlockEntities) {
             this.noCullingBlockEntities.clear();
          }
 
-         this.chunks = new BuiltChunkStorage(this.f_gqcuibba, this.world, this.client.options.getEffectiveViewDistance(), this);
+         this.chunks = new BuiltChunkStorage(this.chunkBuilder, this.world, this.client.options.getEffectiveViewDistance(), this);
          this.f_kfsuutjj.m_kkoyotno(this.chunks);
          this.f_qdsyfzmo.clear();
          Entity lv = this.client.getCameraEntity();
@@ -1082,9 +1087,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_znnjtopn Lnet/minecraft/unmapped/C_sfkkabhx;m_znnjtopn()Ljava/lang/String;}
+    * @mapping {@literal named getChunkBuilderDebugString Lnet/minecraft/client/render/WorldRenderer;getChunkBuilderDebugString()Ljava/lang/String;}
     */
-   public String m_znnjtopn() {
+   public String getChunkBuilderDebugString() {
       int i = this.chunks.f_llzkkcwf.length;
       int j = this.m_wcyzbxhv();
       return String.format(
@@ -1094,15 +1100,15 @@
          i,
          this.client.chunkCullingEnabled ? "(s) " : "",
          this.viewDistance,
-         this.f_gqcuibba == null ? "null" : this.f_gqcuibba.m_zylogpyc()
+         this.chunkBuilder == null ? "null" : this.chunkBuilder.m_zylogpyc()
       );
    }
 
    /**
     * Mapping not found
     */
-   public C_sjynkhfr m_yyzjbtrm() {
-      return this.f_gqcuibba;
+   public ChunkBuilder m_yyzjbtrm() {
+      return this.chunkBuilder;
    }
 
    /**
@@ -1126,7 +1132,7 @@
    public int m_wcyzbxhv() {
       int i = 0;
 
-      for (C_sjynkhfr.C_exmylrbc lv : this.f_qdsyfzmo) {
+      for (ChunkBuilder.C_exmylrbc lv : this.f_qdsyfzmo) {
          if (!lv.m_hyqzqueo().m_zxltqcaf()) {
             i++;
          }
@@ -1167,14 +1173,14 @@
       int i = ChunkSectionPos.getSectionCoord(d);
       int j = ChunkSectionPos.getSectionCoord(e);
       int k = ChunkSectionPos.getSectionCoord(f);
-      if (this.f_yzkmvnyb != i || this.f_yvsvzxdd != j || this.f_cboyeijz != k) {
-         this.f_yzkmvnyb = i;
-         this.f_yvsvzxdd = j;
-         this.f_cboyeijz = k;
+      if (this.cameraChunkX != i || this.cameraChunkY != j || this.cameraChunkZ != k) {
+         this.cameraChunkX = i;
+         this.cameraChunkY = j;
+         this.cameraChunkZ = k;
          this.chunks.updateCameraPosition(d, f);
       }
 
-      this.f_gqcuibba.m_onodhvgj(lv);
+      this.chunkBuilder.m_onodhvgj(lv);
       this.world.getProfiler().swap("cull");
       this.client.getProfiler().swap("culling");
       BlockPos lv2 = camera.getBlockPos();
@@ -1239,7 +1245,7 @@
    /**
     * Mapping not found
     */
-   public void m_admjmrdo(C_sjynkhfr.C_exmylrbc arg) {
+   public void m_admjmrdo(ChunkBuilder.C_exmylrbc arg) {
       this.f_kfsuutjj.m_dmpwdgkq(arg);
    }
 
@@ -1274,8 +1280,8 @@
     * @mapping {@literal hashed m_khytiwdn Lnet/minecraft/unmapped/C_sfkkabhx;m_khytiwdn(Lnet/minecraft/unmapped/C_vgpupfxx;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V}
     * @mapping {@literal named setupFrustum Lnet/minecraft/client/render/WorldRenderer;setupFrustum(Lnet/minecraft/util/math/Vec3d;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V}
     */
-   public void setupFrustum(Vec3d pos, Matrix4f projectionMatrix, Matrix4f matrix4f2) {
-      this.frustum = new Frustum(projectionMatrix, matrix4f2);
+   public void setupFrustum(Vec3d pos, Matrix4f modelViewMatrix, Matrix4f projectionMatrix) {
+      this.frustum = new Frustum(modelViewMatrix, projectionMatrix);
       this.frustum.setPosition(pos.getX(), pos.getY(), pos.getZ());
    }
 
@@ -1289,8 +1295,8 @@
       Camera camera,
       GameRenderer gameRenderer,
       LightmapTextureManager lightmapTextureManager,
-      Matrix4f projectionMatrix,
-      Matrix4f matrix4f2
+      Matrix4f modelViewMatrix,
+      Matrix4f projectionMatrix
    ) {
       TickManager lv = this.client.world.getTickManager();
       float f = tracker.getTickDelta(false);
@@ -1318,7 +1324,7 @@
 
       this.client.getProfiler().swap("captureFrustum");
       if (this.shouldCaptureFrustum) {
-         this.captureFrustum(projectionMatrix, matrix4f2, lv3.x, lv3.y, lv3.z, bl2 ? new Frustum(projectionMatrix, matrix4f2) : lv4);
+         this.captureFrustum(modelViewMatrix, projectionMatrix, lv3.x, lv3.y, lv3.z, bl2 ? new Frustum(modelViewMatrix, projectionMatrix) : lv4);
          this.shouldCaptureFrustum = false;
       }
 
@@ -1331,7 +1337,9 @@
          || this.client.inGameHud.getBossBarHud().shouldThickenFog();
       lv2.swap("sky");
       RenderSystem.setShader(GameRenderer::getPositionShader);
-      this.renderSky(projectionMatrix, matrix4f2, f, camera, bl3, () -> BackgroundRenderer.applyFog(camera, BackgroundRenderer.FogType.FOG_SKY, h, bl3, f));
+      this.renderSky(
+         modelViewMatrix, projectionMatrix, f, camera, bl3, () -> BackgroundRenderer.applyFog(camera, BackgroundRenderer.FogType.FOG_SKY, h, bl3, f)
+      );
       lv2.swap("fog");
       BackgroundRenderer.applyFog(camera, BackgroundRenderer.FogType.FOG_TERRAIN, Math.max(h, 32.0F), bl3, f);
       lv2.swap("terrain_setup");
@@ -1339,9 +1347,9 @@
       lv2.swap("compile_sections");
       this.m_uyzrbqdi(camera);
       lv2.swap("terrain");
-      this.m_pckpreyt(RenderLayer.getSolid(), d, e, g, projectionMatrix, matrix4f2);
-      this.m_pckpreyt(RenderLayer.getCutoutMipped(), d, e, g, projectionMatrix, matrix4f2);
-      this.m_pckpreyt(RenderLayer.getCutout(), d, e, g, projectionMatrix, matrix4f2);
+      this.m_pckpreyt(RenderLayer.getSolid(), d, e, g, modelViewMatrix, projectionMatrix);
+      this.m_pckpreyt(RenderLayer.getCutoutMipped(), d, e, g, modelViewMatrix, projectionMatrix);
+      this.m_pckpreyt(RenderLayer.getCutout(), d, e, g, modelViewMatrix, projectionMatrix);
       if (this.world.getSkyProperties().isDarkened()) {
          DiffuseLighting.setupNetherLighting();
       } else {
@@ -1368,7 +1376,7 @@
 
       Matrix4fStack matrix4fStack = RenderSystem.getModelViewStack();
       matrix4fStack.pushMatrix();
-      matrix4fStack.mul(projectionMatrix);
+      matrix4fStack.mul(modelViewMatrix);
       RenderSystem.applyModelViewMatrix();
       boolean bl4 = false;
       MatrixStack lv6 = new MatrixStack();
@@ -1416,7 +1424,7 @@
       lv7.draw(RenderLayer.getEntitySmoothCutout(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE));
       lv2.swap("blockentities");
 
-      for (C_sjynkhfr.C_exmylrbc lv13 : this.f_qdsyfzmo) {
+      for (ChunkBuilder.C_exmylrbc lv13 : this.f_qdsyfzmo) {
          List<BlockEntity> list = lv13.m_hyqzqueo().m_cnqtwery();
          if (!list.isEmpty()) {
             for (BlockEntity lv14 : list) {
@@ -1432,9 +1440,9 @@
                      VertexConsumer lv18 = new OverlayVertexConsumer(
                         this.bufferBuilders.getEffectVertexConsumers().getBuffer((RenderLayer)ModelLoader.BLOCK_DESTRUCTION_RENDER_LAYERS.get(k)), lv17, 1.0F
                      );
-                     lv16 = arg3 -> {
-                        VertexConsumer lvx = lv7.getBuffer(arg3);
-                        return arg3.hasCrumbling() ? VertexConsumers.union(lv18, lvx) : lvx;
+                     lv16 = renderLayer -> {
+                        VertexConsumer lvx = lv7.getBuffer(renderLayer);
+                        return renderLayer.hasCrumbling() ? VertexConsumers.union(lv18, lvx) : lvx;
                      };
                   }
                }
@@ -1525,9 +1533,9 @@
          this.translucentFramebuffer.clear(MinecraftClient.IS_SYSTEM_MAC);
          this.translucentFramebuffer.copyDepthFrom(this.client.getFramebuffer());
          lv2.swap("translucent");
-         this.m_pckpreyt(RenderLayer.getTranslucent(), d, e, g, projectionMatrix, matrix4f2);
+         this.m_pckpreyt(RenderLayer.getTranslucent(), d, e, g, modelViewMatrix, projectionMatrix);
          lv2.swap("string");
-         this.m_pckpreyt(RenderLayer.getTripwire(), d, e, g, projectionMatrix, matrix4f2);
+         this.m_pckpreyt(RenderLayer.getTripwire(), d, e, g, modelViewMatrix, projectionMatrix);
          this.particlesFramebuffer.clear(MinecraftClient.IS_SYSTEM_MAC);
          this.particlesFramebuffer.copyDepthFrom(this.client.getFramebuffer());
          RenderPhase.PARTICLES_TARGET.startDrawing();
@@ -1540,11 +1548,11 @@
             this.translucentFramebuffer.clear(MinecraftClient.IS_SYSTEM_MAC);
          }
 
-         this.m_pckpreyt(RenderLayer.getTranslucent(), d, e, g, projectionMatrix, matrix4f2);
+         this.m_pckpreyt(RenderLayer.getTranslucent(), d, e, g, modelViewMatrix, projectionMatrix);
          lv7.draw(RenderLayer.getLines());
          lv7.draw();
          lv2.swap("string");
-         this.m_pckpreyt(RenderLayer.getTripwire(), d, e, g, projectionMatrix, matrix4f2);
+         this.m_pckpreyt(RenderLayer.getTripwire(), d, e, g, modelViewMatrix, projectionMatrix);
          lv2.swap("particles");
          this.client.particleManager.renderParticles(lightmapTextureManager, camera, f);
       }
@@ -1555,7 +1563,7 @@
          }
 
          lv2.swap("clouds");
-         this.renderClouds(lv6, projectionMatrix, matrix4f2, f, d, e, g);
+         this.renderClouds(lv6, modelViewMatrix, projectionMatrix, f, d, e, g);
       }
 
       if (this.transparencyShader != null) {
@@ -1633,8 +1641,8 @@
             this.lastTranslucentSortZ = f;
             int m = 0;
 
-            for (C_sjynkhfr.C_exmylrbc lv : this.f_qdsyfzmo) {
-               if (m < 15 && (bl || lv.m_jztoklfm(j, k, l)) && lv.m_ycspbizp(arg, this.f_gqcuibba)) {
+            for (ChunkBuilder.C_exmylrbc lv : this.f_qdsyfzmo) {
+               if (m < 15 && (bl || lv.m_jztoklfm(j, k, l)) && lv.m_ycspbizp(arg, this.chunkBuilder)) {
                   m++;
                }
             }
@@ -1646,14 +1654,14 @@
       this.client.getProfiler().push("filterempty");
       this.client.getProfiler().swap((Supplier<String>)(() -> "render_" + arg));
       boolean bl2 = arg != RenderLayer.getTranslucent();
-      ObjectListIterator<C_sjynkhfr.C_exmylrbc> objectListIterator = this.f_qdsyfzmo.listIterator(bl2 ? 0 : this.f_qdsyfzmo.size());
+      ObjectListIterator<ChunkBuilder.C_exmylrbc> objectListIterator = this.f_qdsyfzmo.listIterator(bl2 ? 0 : this.f_qdsyfzmo.size());
       ShaderProgram lv2 = RenderSystem.getShader();
       lv2.bindUniforms(VertexFormat.DrawMode.QUADS, matrix4f, matrix4f2, this.client.getWindow());
       lv2.bind();
       GlUniform lv3 = lv2.chunkOffset;
 
       while (bl2 ? objectListIterator.hasNext() : objectListIterator.hasPrevious()) {
-         C_sjynkhfr.C_exmylrbc lv4 = bl2 ? (C_sjynkhfr.C_exmylrbc)objectListIterator.next() : objectListIterator.previous();
+         ChunkBuilder.C_exmylrbc lv4 = bl2 ? (ChunkBuilder.C_exmylrbc)objectListIterator.next() : objectListIterator.previous();
          if (!lv4.m_hyqzqueo().m_kppkuamn(arg)) {
             VertexBuffer lv5 = lv4.m_akukfhve(arg);
             BlockPos lv6 = lv4.m_apvthafb();
@@ -1687,7 +1695,7 @@
          double e = camera.getPos().getY();
          double f = camera.getPos().getZ();
 
-         for (C_sjynkhfr.C_exmylrbc lv : this.f_qdsyfzmo) {
+         for (ChunkBuilder.C_exmylrbc lv : this.f_qdsyfzmo) {
             C_jnliocmw.C_rslogvyf lv2 = this.f_kfsuutjj.m_geodkceg(lv);
             if (lv2 != null) {
                BlockPos lv3 = lv.m_apvthafb();
@@ -1969,13 +1977,13 @@
     * @mapping {@literal hashed m_qwqxlbnd Lnet/minecraft/unmapped/C_sfkkabhx;m_qwqxlbnd(Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/unmapped/C_dcmtgrvm;ZLjava/lang/Runnable;)V}
     * @mapping {@literal named renderSky Lnet/minecraft/client/render/WorldRenderer;renderSky(Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/client/render/Camera;ZLjava/lang/Runnable;)V}
     */
-   public void renderSky(Matrix4f projectionMatrix, Matrix4f matrix4f2, float tickDelta, Camera preStep, boolean skipRendering, Runnable preRender) {
+   public void renderSky(Matrix4f modelViewMatrix, Matrix4f projectionMatrix, float tickDelta, Camera preStep, boolean skipRendering, Runnable preRender) {
       preRender.run();
       if (!skipRendering) {
          CameraSubmersionType lv = preStep.getSubmersionType();
          if (lv != CameraSubmersionType.POWDER_SNOW && lv != CameraSubmersionType.LAVA && !this.hasSkyBlockingEffect(preStep)) {
             MatrixStack lv2 = new MatrixStack();
-            lv2.multiply(projectionMatrix);
+            lv2.multiply(modelViewMatrix);
             if (this.client.world.getSkyProperties().getSkyType() == DimensionVisualEffects.SkyType.END) {
                this.renderEndSky(lv2);
             } else if (this.client.world.getSkyProperties().getSkyType() == DimensionVisualEffects.SkyType.NORMAL) {
@@ -1989,7 +1997,7 @@
                RenderSystem.setShaderColor(g, h, i, 1.0F);
                ShaderProgram lv5 = RenderSystem.getShader();
                this.lightSkyBuffer.bind();
-               this.lightSkyBuffer.draw(lv2.peek().getModel(), matrix4f2, lv5);
+               this.lightSkyBuffer.draw(lv2.peek().getModel(), projectionMatrix, lv5);
                VertexBuffer.unbind();
                RenderSystem.enableBlend();
                float[] fs = this.world.getSkyProperties().getFogColorOverride(this.world.getSkyAngle(tickDelta), tickDelta);
@@ -2058,7 +2066,7 @@
                   RenderSystem.setShaderColor(ab, ab, ab, ab);
                   BackgroundRenderer.clearFog();
                   this.starsBuffer.bind();
-                  this.starsBuffer.draw(lv2.peek().getModel(), matrix4f2, GameRenderer.getPositionShader());
+                  this.starsBuffer.draw(lv2.peek().getModel(), projectionMatrix, GameRenderer.getPositionShader());
                   VertexBuffer.unbind();
                   preRender.run();
                }
@@ -2073,7 +2081,7 @@
                   lv2.push();
                   lv2.translate(0.0F, 12.0F, 0.0F);
                   this.darkSkyBuffer.bind();
-                  this.darkSkyBuffer.draw(lv2.peek().getModel(), matrix4f2, lv5);
+                  this.darkSkyBuffer.draw(lv2.peek().getModel(), projectionMatrix, lv5);
                   VertexBuffer.unbind();
                   lv2.pop();
                }
@@ -2361,9 +2369,9 @@
       LightingProvider lv = this.world.getLightingProvider();
       ChunkRenderRegionCache lv2 = new ChunkRenderRegionCache();
       BlockPos lv3 = camera.getBlockPos();
-      List<C_sjynkhfr.C_exmylrbc> list = Lists.<C_sjynkhfr.C_exmylrbc>newArrayList();
+      List<ChunkBuilder.C_exmylrbc> list = Lists.<ChunkBuilder.C_exmylrbc>newArrayList();
 
-      for (C_sjynkhfr.C_exmylrbc lv4 : this.f_qdsyfzmo) {
+      for (ChunkBuilder.C_exmylrbc lv4 : this.f_qdsyfzmo) {
          ChunkSectionPos lv5 = ChunkSectionPos.from(lv4.m_apvthafb());
          if (lv4.m_ektcraor() && lv.isLightingEnabled(lv5)) {
             boolean bl = false;
@@ -2376,7 +2384,7 @@
 
             if (bl) {
                this.client.getProfiler().push("build_near_sync");
-               this.f_gqcuibba.m_nymgawbn(lv4, lv2);
+               this.chunkBuilder.m_nymgawbn(lv4, lv2);
                lv4.m_xuhqyblp();
                this.client.getProfiler().pop();
             } else {
@@ -2386,11 +2394,11 @@
       }
 
       this.client.getProfiler().swap("upload");
-      this.f_gqcuibba.m_ljxpcrlr();
+      this.chunkBuilder.m_ljxpcrlr();
       this.client.getProfiler().swap("schedule_async_compile");
 
-      for (C_sjynkhfr.C_exmylrbc lv7 : list) {
-         lv7.m_qvakteqa(this.f_gqcuibba, lv2);
+      for (ChunkBuilder.C_exmylrbc lv7 : list) {
+         lv7.m_qvakteqa(this.chunkBuilder, lv2);
          lv7.m_xuhqyblp();
       }
 
@@ -2940,7 +2948,7 @@
          C_yeazlrrn lv = arg.value();
          SoundEvent lv2 = lv.soundEvent().value();
          SoundInstance lv3 = PositionedSoundInstance.m_omlykfec(lv2, Vec3d.ofCenter(pos));
-         this.f_oppequxe.put(pos, lv3);
+         this.currentSounds.put(pos, lv3);
          this.client.getSoundManager().play(lv3);
          this.client.inGameHud.setRecordPlayingOverlay(lv.description());
          this.updateEntitiesForSong(this.world, pos, true);
@@ -2952,7 +2960,7 @@
     * @mapping {@literal named m_lfenycuv Lnet/minecraft/client/render/WorldRenderer;m_lfenycuv(Lnet/minecraft/util/math/BlockPos;)V}
     */
    private void m_lfenycuv(BlockPos pos) {
-      SoundInstance lv = (SoundInstance)this.f_oppequxe.remove(pos);
+      SoundInstance lv = (SoundInstance)this.currentSounds.remove(pos);
       if (lv != null) {
          this.client.getSoundManager().stop(lv);
       }
@@ -3293,7 +3301,7 @@
                   pos, SoundEvents.ENTITY_WIND_CHARGE_THROW, SoundCategory.BLOCKS, 0.5F, 0.4F / (this.world.getRandom().nextFloat() * 0.4F + 0.8F), false
                );
          case 2010:
-            this.m_kvtxvfgf(data, pos, lv, ParticleTypes.WHITE_SMOKE);
+            this.createParticles(data, pos, lv, ParticleTypes.WHITE_SMOKE);
             break;
          case 1500:
             ComposterBlock.playEffects(this.world, pos, data > 0);
@@ -3343,7 +3351,7 @@
             this.world.playSound(pos, SoundEvents.ITEM_BONE_MEAL_USE, SoundCategory.BLOCKS, 1.0F, 1.0F, false);
             break;
          case 2000:
-            this.m_kvtxvfgf(data, pos, lv, ParticleTypes.SMOKE);
+            this.createParticles(data, pos, lv, ParticleTypes.SMOKE);
             break;
          case 2001:
             BlockState lv5 = Block.getStateFromRawId(data);
@@ -3698,7 +3706,7 @@
     * Mapping not found
     */
    public boolean m_jwysdltg() {
-      return this.f_gqcuibba.m_jolodfem();
+      return this.chunkBuilder.m_jolodfem();
    }
 
    /**
@@ -3760,8 +3768,8 @@
     * @mapping {@literal named m_rzgnhorc Lnet/minecraft/client/render/WorldRenderer;m_rzgnhorc(Lnet/minecraft/util/math/BlockPos;)Z}
     */
    public boolean m_rzgnhorc(BlockPos pos) {
-      C_sjynkhfr.C_exmylrbc lv = this.chunks.m_jpnxgjcl(pos);
-      return lv != null && lv.f_tgudfvdi.get() != C_sjynkhfr.C_tspjbhud.f_tczcdyxm;
+      ChunkBuilder.C_exmylrbc lv = this.chunks.m_jpnxgjcl(pos);
+      return lv != null && lv.f_tgudfvdi.get() != ChunkBuilder.C_tspjbhud.f_tczcdyxm;
    }
 
    /**
@@ -3820,9 +3828,9 @@
 
    /**
     * @mapping {@literal hashed m_kvtxvfgf Lnet/minecraft/unmapped/C_sfkkabhx;m_kvtxvfgf(ILnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_lwmufxcy;)V}
-    * @mapping {@literal named m_kvtxvfgf Lnet/minecraft/client/render/WorldRenderer;m_kvtxvfgf(ILnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/particle/DefaultParticleType;)V}
+    * @mapping {@literal named createParticles Lnet/minecraft/client/render/WorldRenderer;createParticles(ILnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/particle/DefaultParticleType;)V}
     */
-   private void m_kvtxvfgf(int id, BlockPos pos, RandomGenerator random, DefaultParticleType arg3) {
+   private void createParticles(int id, BlockPos pos, RandomGenerator random, DefaultParticleType particle) {
       Direction lv = Direction.byId(id);
       int j = lv.getOffsetX();
       int k = lv.getOffsetY();
@@ -3839,7 +3847,7 @@
          double p = (double)j * g + random.nextGaussian() * 0.01;
          double q = (double)k * g + random.nextGaussian() * 0.01;
          double r = (double)l * g + random.nextGaussian() * 0.01;
-         this.addParticle(arg3, h, n, o, p, q, r);
+         this.addParticle(particle, h, n, o, p, q, r);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/util/ClientSamplerSource.java namedSrc/net/minecraft/client/util/ClientSamplerSource.java
--- namedTargetSrc/net/minecraft/client/util/ClientSamplerSource.java	2024-08-01 19:09:20.411505921 +0000
+++ namedSrc/net/minecraft/client/util/ClientSamplerSource.java	2024-08-01 19:08:11.934236327 +0000
@@ -9,7 +9,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.unmapped.C_sjynkhfr;
+import net.minecraft.client.render.chunk.ChunkBuilder;
 import net.minecraft.util.profiler.ReadableProfiler;
 import net.minecraft.util.profiler.SampleType;
 import net.minecraft.util.profiler.Sampler;
@@ -58,10 +58,10 @@
       this.samplers.add(Sampler.create("totalChunks", SampleType.CHUNK_RENDERING, this.renderer, WorldRenderer::m_idnnlhwb));
       this.samplers.add(Sampler.create("renderedChunks", SampleType.CHUNK_RENDERING, this.renderer, WorldRenderer::m_wcyzbxhv));
       this.samplers.add(Sampler.create("lastViewDistance", SampleType.CHUNK_RENDERING, this.renderer, WorldRenderer::getViewDistance));
-      C_sjynkhfr lv = this.renderer.m_yyzjbtrm();
-      this.samplers.add(Sampler.create("toUpload", SampleType.CHUNK_RENDERING_DISPATCHING, lv, C_sjynkhfr::m_rncrkajk));
-      this.samplers.add(Sampler.create("freeBufferCount", SampleType.CHUNK_RENDERING_DISPATCHING, lv, C_sjynkhfr::m_jxbkgmnw));
-      this.samplers.add(Sampler.create("toBatchCount", SampleType.CHUNK_RENDERING_DISPATCHING, lv, C_sjynkhfr::m_etrueqhc));
+      ChunkBuilder lv = this.renderer.m_yyzjbtrm();
+      this.samplers.add(Sampler.create("toUpload", SampleType.CHUNK_RENDERING_DISPATCHING, lv, ChunkBuilder::m_rncrkajk));
+      this.samplers.add(Sampler.create("freeBufferCount", SampleType.CHUNK_RENDERING_DISPATCHING, lv, ChunkBuilder::m_jxbkgmnw));
+      this.samplers.add(Sampler.create("toBatchCount", SampleType.CHUNK_RENDERING_DISPATCHING, lv, ChunkBuilder::m_etrueqhc));
       if (RenderProfiler.getInstance().isPresent()) {
          this.samplers.add(Sampler.create("gpuUtilization", SampleType.GPU, MinecraftClient.getInstance(), MinecraftClient::getGpuUtilization));
       }
diff -bur namedTargetSrc/net/minecraft/unmapped/C_jnliocmw.java namedSrc/net/minecraft/unmapped/C_jnliocmw.java
--- namedTargetSrc/net/minecraft/unmapped/C_jnliocmw.java	2024-08-01 19:09:20.431506295 +0000
+++ namedSrc/net/minecraft/unmapped/C_jnliocmw.java	2024-08-01 19:08:11.966236914 +0000
@@ -26,6 +26,7 @@
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.Frustum;
 import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.render.chunk.ChunkBuilder;
 import net.minecraft.util.Util;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.math.BlockPos;
@@ -120,7 +121,7 @@
    /**
     * Mapping not found
     */
-   public void m_gndifavm(Frustum arg, List<C_sjynkhfr.C_exmylrbc> list) {
+   public void m_gndifavm(Frustum arg, List<ChunkBuilder.C_exmylrbc> list) {
       for (C_jnliocmw.C_rslogvyf lv : ((C_jnliocmw.C_limxhopi)this.f_ymkthglq.get()).storage().f_rodjfmdc) {
          if (arg.isVisible(lv.f_jzfmkmyq.m_vilpmiub())) {
             list.add(lv.f_jzfmkmyq);
@@ -153,7 +154,7 @@
    /**
     * Mapping not found
     */
-   public void m_dmpwdgkq(C_sjynkhfr.C_exmylrbc arg) {
+   public void m_dmpwdgkq(ChunkBuilder.C_exmylrbc arg) {
       C_jnliocmw.C_gwrnvzqg lv = (C_jnliocmw.C_gwrnvzqg)this.f_crqcppwr.get();
       if (lv != null) {
          lv.sectionsToPropagateFrom.add(arg);
@@ -169,7 +170,7 @@
     * @mapping {@literal hashed m_hkpcmvfm Lnet/minecraft/unmapped/C_jnliocmw;m_hkpcmvfm(ZLnet/minecraft/unmapped/C_dcmtgrvm;Lnet/minecraft/unmapped/C_jwzjqevg;Ljava/util/List;)V}
     * @mapping {@literal named m_hkpcmvfm Lnet/minecraft/unmapped/C_jnliocmw;m_hkpcmvfm(ZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/Frustum;Ljava/util/List;)V}
     */
-   public void m_hkpcmvfm(boolean bl, Camera camera, Frustum arg2, List<C_sjynkhfr.C_exmylrbc> list) {
+   public void m_hkpcmvfm(boolean bl, Camera camera, Frustum arg2, List<ChunkBuilder.C_exmylrbc> list) {
       Vec3d lv = camera.getPos();
       if (this.f_hjuggrmo && (this.f_yjrzxewc == null || this.f_yjrzxewc.isDone())) {
          this.m_yxpdbtyy(bl, camera, lv);
@@ -201,14 +202,14 @@
    /**
     * Mapping not found
     */
-   private void m_fqbmedyx(boolean bl, Frustum arg, List<C_sjynkhfr.C_exmylrbc> list, Vec3d arg2) {
+   private void m_fqbmedyx(boolean bl, Frustum arg, List<ChunkBuilder.C_exmylrbc> list, Vec3d arg2) {
       C_jnliocmw.C_limxhopi lv = (C_jnliocmw.C_limxhopi)this.f_ymkthglq.get();
       this.m_mateoxjf(lv);
       if (!lv.events.sectionsToPropagateFrom.isEmpty()) {
          Queue<C_jnliocmw.C_rslogvyf> queue = Queues.<C_jnliocmw.C_rslogvyf>newArrayDeque();
 
          while (!lv.events.sectionsToPropagateFrom.isEmpty()) {
-            C_sjynkhfr.C_exmylrbc lv2 = (C_sjynkhfr.C_exmylrbc)lv.events.sectionsToPropagateFrom.poll();
+            ChunkBuilder.C_exmylrbc lv2 = (ChunkBuilder.C_exmylrbc)lv.events.sectionsToPropagateFrom.poll();
             C_jnliocmw.C_rslogvyf lv3 = lv.storage.f_jhkuqdps.m_bqjhtcyi(lv2);
             if (lv3 != null && lv3.f_jzfmkmyq == lv2) {
                queue.add(lv3);
@@ -216,7 +217,7 @@
          }
 
          Frustum lv4 = WorldRenderer.m_tamcgvjw(arg);
-         Consumer<C_sjynkhfr.C_exmylrbc> consumer = arg2x -> {
+         Consumer<ChunkBuilder.C_exmylrbc> consumer = arg2x -> {
             if (lv4.isVisible(arg2x.m_vilpmiub())) {
                list.add(arg2x);
             }
@@ -233,8 +234,8 @@
 
       while (longIterator.hasNext()) {
          long l = longIterator.nextLong();
-         List<C_sjynkhfr.C_exmylrbc> list = arg.storage.f_ujhobiol.get(l);
-         if (list != null && ((C_sjynkhfr.C_exmylrbc)list.get(0)).m_jccyislo()) {
+         List<ChunkBuilder.C_exmylrbc> list = arg.storage.f_ujhobiol.get(l);
+         if (list != null && ((ChunkBuilder.C_exmylrbc)list.get(0)).m_jccyislo()) {
             arg.events.sectionsToPropagateFrom.addAll(list);
             arg.storage.f_ujhobiol.remove(l);
          }
@@ -261,7 +262,7 @@
       int i = 16;
       Vec3d lv = camera.getPos();
       BlockPos lv2 = camera.getBlockPos();
-      C_sjynkhfr.C_exmylrbc lv3 = this.f_ghbgvgzi.m_jpnxgjcl(lv2);
+      ChunkBuilder.C_exmylrbc lv3 = this.f_ghbgvgzi.m_jpnxgjcl(lv2);
       if (lv3 == null) {
          HeightLimitView lv4 = this.f_ghbgvgzi.getWorld();
          boolean bl = lv2.getY() > lv4.getBottomY();
@@ -273,7 +274,7 @@
 
          for (int n = -m; n <= m; n++) {
             for (int o = -m; o <= m; o++) {
-               C_sjynkhfr.C_exmylrbc lv5 = this.f_ghbgvgzi
+               ChunkBuilder.C_exmylrbc lv5 = this.f_ghbgvgzi
                   .m_jpnxgjcl(new BlockPos(k + ChunkSectionPos.getOffsetPos(n, 8), j, l + ChunkSectionPos.getOffsetPos(o, 8)));
                if (lv5 != null && this.m_pabghxwa(lv2, lv5.m_apvthafb())) {
                   Direction lv6 = bl ? Direction.DOWN : Direction.UP;
@@ -306,14 +307,14 @@
    /**
     * Mapping not found
     */
-   private void m_qeysollx(C_jnliocmw.C_bxmhdxlt arg, Vec3d arg2, Queue<C_jnliocmw.C_rslogvyf> queue, boolean bl, Consumer<C_sjynkhfr.C_exmylrbc> consumer) {
+   private void m_qeysollx(C_jnliocmw.C_bxmhdxlt arg, Vec3d arg2, Queue<C_jnliocmw.C_rslogvyf> queue, boolean bl, Consumer<ChunkBuilder.C_exmylrbc> consumer) {
       int i = 16;
       BlockPos lv = new BlockPos(MathHelper.floor(arg2.x / 16.0) * 16, MathHelper.floor(arg2.y / 16.0) * 16, MathHelper.floor(arg2.z / 16.0) * 16);
       BlockPos lv2 = lv.add(8, 8, 8);
 
       while (!queue.isEmpty()) {
          C_jnliocmw.C_rslogvyf lv3 = (C_jnliocmw.C_rslogvyf)queue.poll();
-         C_sjynkhfr.C_exmylrbc lv4 = lv3.f_jzfmkmyq;
+         ChunkBuilder.C_exmylrbc lv4 = lv3.f_jzfmkmyq;
          if (arg.f_rodjfmdc.add(lv3)) {
             consumer.accept(lv3.f_jzfmkmyq);
          }
@@ -323,10 +324,10 @@
             || Math.abs(lv4.m_apvthafb().getZ() - lv.getZ()) > 60;
 
          for (Direction lv5 : f_occebuxm) {
-            C_sjynkhfr.C_exmylrbc lv6 = this.m_jsehgzmo(lv, lv4, lv5);
+            ChunkBuilder.C_exmylrbc lv6 = this.m_jsehgzmo(lv, lv4, lv5);
             if (lv6 != null && (!bl || !lv3.m_cvyhzcer(lv5.getOpposite()))) {
                if (bl && lv3.m_ththvlss()) {
-                  C_sjynkhfr.C_tspjbhud lv7 = lv4.m_hyqzqueo();
+                  ChunkBuilder.C_tspjbhud lv7 = lv4.m_hyqzqueo();
                   boolean bl3 = false;
 
                   for (int j = 0; j < f_occebuxm.length; j++) {
@@ -359,7 +360,7 @@
                         break;
                      }
 
-                     C_sjynkhfr.C_exmylrbc lv13 = this.f_ghbgvgzi.m_jpnxgjcl(BlockPos.create(lv10.x, lv10.y, lv10.z));
+                     ChunkBuilder.C_exmylrbc lv13 = this.f_ghbgvgzi.m_jpnxgjcl(BlockPos.create(lv10.x, lv10.y, lv10.z));
                      if (lv13 == null || arg.f_jhkuqdps.m_bqjhtcyi(lv13) == null) {
                         bl4 = false;
                         break;
@@ -383,7 +384,9 @@
                   } else if (this.m_pabghxwa(lv, lv6.m_apvthafb())) {
                      arg.f_jhkuqdps.m_lrzmbpzz(lv6, lv15);
                      arg.f_ujhobiol
-                        .computeIfAbsent(ChunkPos.toLong(lv6.m_apvthafb()), (Long2ObjectFunction<? extends List<C_sjynkhfr.C_exmylrbc>>)(l -> new ArrayList()))
+                        .computeIfAbsent(
+                           ChunkPos.toLong(lv6.m_apvthafb()), (Long2ObjectFunction<? extends List<ChunkBuilder.C_exmylrbc>>)(l -> new ArrayList())
+                        )
                         .add(lv6);
                   }
                }
@@ -405,10 +408,10 @@
 
    /**
     * @mapping {@literal hashed m_jsehgzmo Lnet/minecraft/unmapped/C_jnliocmw;m_jsehgzmo(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;}
-    * @mapping {@literal named m_jsehgzmo Lnet/minecraft/unmapped/C_jnliocmw;m_jsehgzmo(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;}
+    * @mapping {@literal named m_jsehgzmo Lnet/minecraft/unmapped/C_jnliocmw;m_jsehgzmo(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/render/chunk/ChunkBuilder$C_exmylrbc;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/client/render/chunk/ChunkBuilder$C_exmylrbc;}
     */
    @Nullable
-   private C_sjynkhfr.C_exmylrbc m_jsehgzmo(BlockPos pos, C_sjynkhfr.C_exmylrbc arg2, Direction direction) {
+   private ChunkBuilder.C_exmylrbc m_jsehgzmo(BlockPos pos, ChunkBuilder.C_exmylrbc arg2, Direction direction) {
       BlockPos lv = arg2.m_fctjayju(direction);
       if (!this.m_pabghxwa(pos, lv)) {
          return null;
@@ -422,7 +425,7 @@
     */
    @Nullable
    @Debug
-   protected C_jnliocmw.C_rslogvyf m_geodkceg(C_sjynkhfr.C_exmylrbc arg) {
+   protected C_jnliocmw.C_rslogvyf m_geodkceg(ChunkBuilder.C_exmylrbc arg) {
       return ((C_jnliocmw.C_limxhopi)this.f_ymkthglq.get()).storage.f_jhkuqdps.m_bqjhtcyi(arg);
    }
 
@@ -443,7 +446,7 @@
       /**
        * Mapping not found
        */
-      public final Long2ObjectMap<List<C_sjynkhfr.C_exmylrbc>> f_ujhobiol;
+      public final Long2ObjectMap<List<ChunkBuilder.C_exmylrbc>> f_ujhobiol;
 
       /**
        * Mapping not found
@@ -460,7 +463,7 @@
     * @mapping {@literal named net/minecraft/unmapped/C_jnliocmw$C_gwrnvzqg}
     */
    @Environment(EnvType.CLIENT)
-   static record C_gwrnvzqg(LongSet chunksWhichReceivedNeighbors, BlockingQueue<C_sjynkhfr.C_exmylrbc> sectionsToPropagateFrom) {
+   static record C_gwrnvzqg(LongSet chunksWhichReceivedNeighbors, BlockingQueue<ChunkBuilder.C_exmylrbc> sectionsToPropagateFrom) {
 
       /**
        * Mapping not found
@@ -506,7 +509,7 @@
       /**
        * Mapping not found
        */
-      public void m_lrzmbpzz(C_sjynkhfr.C_exmylrbc arg, C_jnliocmw.C_rslogvyf arg2) {
+      public void m_lrzmbpzz(ChunkBuilder.C_exmylrbc arg, C_jnliocmw.C_rslogvyf arg2) {
          this.f_dvwltxop[arg.f_jcyejnjx] = arg2;
       }
 
@@ -514,7 +517,7 @@
        * Mapping not found
        */
       @Nullable
-      public C_jnliocmw.C_rslogvyf m_bqjhtcyi(C_sjynkhfr.C_exmylrbc arg) {
+      public C_jnliocmw.C_rslogvyf m_bqjhtcyi(ChunkBuilder.C_exmylrbc arg) {
          int i = arg.f_jcyejnjx;
          return i >= 0 && i < this.f_dvwltxop.length ? this.f_dvwltxop[i] : null;
       }
@@ -531,7 +534,7 @@
        * Mapping not found
        */
       @Debug
-      protected final C_sjynkhfr.C_exmylrbc f_jzfmkmyq;
+      protected final ChunkBuilder.C_exmylrbc f_jzfmkmyq;
       /**
        * Mapping not found
        */
@@ -548,9 +551,9 @@
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jnliocmw$C_rslogvyf;<init>(Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;Lnet/minecraft/unmapped/C_xpuuihxf;I)V}
-       * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_jnliocmw$C_rslogvyf;<init>(Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;Lnet/minecraft/util/math/Direction;I)V}
+       * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_jnliocmw$C_rslogvyf;<init>(Lnet/minecraft/client/render/chunk/ChunkBuilder$C_exmylrbc;Lnet/minecraft/util/math/Direction;I)V}
        */
-      C_rslogvyf(C_sjynkhfr.C_exmylrbc arg, @Nullable Direction direction, int i) {
+      C_rslogvyf(ChunkBuilder.C_exmylrbc arg, @Nullable Direction direction, int i) {
          this.f_jzfmkmyq = arg;
          if (direction != null) {
             this.m_szfgnszg(direction);
Only in namedTargetSrc/net/minecraft/unmapped: C_sjynkhfr.java
diff -bur namedTargetSrc/net/minecraft/util/math/MathHelper.java namedSrc/net/minecraft/util/math/MathHelper.java
--- namedTargetSrc/net/minecraft/util/math/MathHelper.java	2024-08-01 19:09:20.599509437 +0000
+++ namedSrc/net/minecraft/util/math/MathHelper.java	2024-08-01 19:08:12.202241252 +0000
@@ -1158,9 +1158,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_saszmoqp Lnet/minecraft/unmapped/C_zpccxxiz;m_saszmoqp(FFF)F}
+    * @mapping {@literal named lengthSquared Lnet/minecraft/util/math/MathHelper;lengthSquared(FFF)F}
     */
-   public static float m_saszmoqp(float f, float g, float h) {
+   public static float lengthSquared(float f, float g, float h) {
       return f * f + g * g + h * h;
    }

Please sign in to comment.